From gbenson at redhat.com  Mon Nov  3 05:31:02 2008
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 03 Nov 2008 13:31:02 +0000
Subject: changeset in /hg/icedtea6: 2008-11-03  Gary Benson  <gbenson@red...
Message-ID: <hg.002c8f181f67.1225719062.2873452341184383832@icedtea.classpath.org>

changeset 002c8f181f67 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=002c8f181f67
description:
	2008-11-03  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
		(BytecodeInterpreter::VMintShl): Only shift by the lower five bits.
		(BytecodeInterpreter::VMintShr): Likewise.
		(BytecodeInterpreter::VMintUshr): Likewise.

diffstat:

2 files changed, 10 insertions(+), 4 deletions(-)
ChangeLog                                                         |    7 +++++++
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp |    7 +++----

diffs (48 lines):

diff -r a5e8efb4fcff -r 002c8f181f67 ChangeLog
--- a/ChangeLog	Fri Oct 31 15:19:14 2008 -0400
+++ b/ChangeLog	Mon Nov 03 08:30:13 2008 -0500
@@ -1,3 +1,10 @@ 2008-10-31  Deepak Bhole  <dbhole at redhat
+2008-11-03  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
+	(BytecodeInterpreter::VMintShl): Only shift by the lower five bits.
+	(BytecodeInterpreter::VMintShr): Likewise.
+	(BytecodeInterpreter::VMintUshr): Likewise.
+
 2008-10-31  Deepak Bhole  <dbhole at redhat.com>
 
 	* IcedTeaPlugin.cc: Fix potential DoS issue when dealing with very long
diff -r a5e8efb4fcff -r 002c8f181f67 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp	Fri Oct 31 15:19:14 2008 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp	Mon Nov 03 08:30:13 2008 -0500
@@ -82,7 +82,6 @@ inline jlong BytecodeInterpreter::VMlong
 }
 
 inline jlong BytecodeInterpreter::VMlongUshr(jlong op1, jint op2) {
-  // CVM did this 0x3f mask, is the really needed??? QQQ
   return ((unsigned long long) op1) >> (op2 & 0x3F);
 }
 
@@ -237,11 +236,11 @@ inline jint BytecodeInterpreter::VMintRe
 }
 
 inline jint BytecodeInterpreter::VMintShl(jint op1, jint op2) {
-  return op1 <<  op2;
+  return op1 << (op2 & 0x1F);
 }
 
 inline jint BytecodeInterpreter::VMintShr(jint op1, jint op2) {
-  return op1 >>  op2; // QQ op2 & 0x1f??
+  return op1 >> (op2 & 0x1F);
 }
 
 inline jint BytecodeInterpreter::VMintSub(jint op1, jint op2) {
@@ -249,7 +248,7 @@ inline jint BytecodeInterpreter::VMintSu
 }
 
 inline jint BytecodeInterpreter::VMintUshr(jint op1, jint op2) {
-  return ((juint) op1) >> op2; // QQ op2 & 0x1f??
+  return ((juint) op1) >> (op2 & 0x1F);
 }
 
 inline jint BytecodeInterpreter::VMintXor(jint op1, jint op2) {


From gbenson at redhat.com  Mon Nov  3 05:56:40 2008
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 03 Nov 2008 13:56:40 +0000
Subject: changeset in /hg/icedtea6: 2008-11-03  Gary Benson  <gbenson@red...
Message-ID: <hg.f58ec27b8941.1225720600.2873452341184383832@icedtea.classpath.org>

changeset f58ec27b8941 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f58ec27b8941
description:
	2008-11-03  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::parse): Fix shift instructions to use only the
		lower order bits of the second argument.

diffstat:

2 files changed, 27 insertions(+), 6 deletions(-)
ChangeLog                                       |    6 +++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp |   27 +++++++++++++++++------

diffs (81 lines):

diff -r 002c8f181f67 -r f58ec27b8941 ChangeLog
--- a/ChangeLog	Mon Nov 03 08:30:13 2008 -0500
+++ b/ChangeLog	Mon Nov 03 08:56:35 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-03  Gary Benson  <gbenson at redhat
+2008-11-03  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse): Fix shift instructions to use only the
+	lower order bits of the second argument.
+
 2008-11-03  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp
diff -r 002c8f181f67 -r f58ec27b8941 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Mon Nov 03 08:30:13 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Mon Nov 03 08:56:35 2008 -0500
@@ -486,19 +486,28 @@ void SharkBlock::parse()
       b = pop();
       a = pop();
       push(SharkValue::create_jint(
-        builder()->CreateShl(a->jint_value(), b->jint_value())));
+        builder()->CreateShl(
+          a->jint_value(),
+          builder()->CreateAnd(
+            b->jint_value(), LLVMValue::jint_constant(0x1f))));
       break;
     case Bytecodes::_ishr:
       b = pop();
       a = pop();
       push(SharkValue::create_jint(
-        builder()->CreateAShr(a->jint_value(), b->jint_value())));
+        builder()->CreateAShr(
+          a->jint_value(),
+          builder()->CreateAnd(
+            b->jint_value(), LLVMValue::jint_constant(0x1f))));
       break;
     case Bytecodes::_iushr:
       b = pop();
       a = pop();
       push(SharkValue::create_jint(
-        builder()->CreateLShr(a->jint_value(), b->jint_value())));
+        builder()->CreateLShr(
+          a->jint_value(),
+          builder()->CreateAnd(
+            b->jint_value(), LLVMValue::jint_constant(0x1f))));
       break;
     case Bytecodes::_iand:
       b = pop();
@@ -555,7 +564,9 @@ void SharkBlock::parse()
         builder()->CreateShl(
           a->jlong_value(),
           builder()->CreateIntCast(
-            b->jint_value(), SharkType::jlong_type(), true))));
+            builder()->CreateAnd(
+              b->jint_value(), LLVMValue::jint_constant(0x3f)),
+            SharkType::jlong_type(), true))));
       break;
     case Bytecodes::_lshr:
       b = pop();
@@ -564,7 +575,9 @@ void SharkBlock::parse()
         builder()->CreateAShr(
           a->jlong_value(),
           builder()->CreateIntCast(
-            b->jint_value(), SharkType::jlong_type(), true))));
+            builder()->CreateAnd(
+              b->jint_value(), LLVMValue::jint_constant(0x3f)),
+            SharkType::jlong_type(), true))));
       break;
     case Bytecodes::_lushr:
       b = pop();
@@ -573,7 +586,9 @@ void SharkBlock::parse()
         builder()->CreateLShr(
           a->jlong_value(),
           builder()->CreateIntCast(
-            b->jint_value(), SharkType::jlong_type(), true))));
+            builder()->CreateAnd(
+              b->jint_value(), LLVMValue::jint_constant(0x3f)),
+            SharkType::jlong_type(), true))));
       break;
     case Bytecodes::_land:
       b = pop();


From omajid at redhat.com  Mon Nov  3 13:57:03 2008
From: omajid at redhat.com (Omair Majid)
Date: Mon, 03 Nov 2008 21:57:03 +0000
Subject: changeset in /hg/icedtea6: 2008-11-03  Omair Majid  <omajid@redh...
Message-ID: <hg.3120ce63433d.1225749423.2873452341184383832@icedtea.classpath.org>

changeset 3120ce63433d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3120ce63433d
description:
	2008-11-03  Omair Majid  <omajid at redhat.com>

	    * patches/icedtea-alsa-default-device.patch: New patch. Use the ALSA
	    'default' device if possible. Makes Java play nice with PulseAudio.

diffstat:

3 files changed, 24 insertions(+), 1 deletion(-)
ChangeLog                                 |    5 +++++
Makefile.am                               |    3 ++-
patches/icedtea-alsa-default-device.patch |   17 +++++++++++++++++

diffs (46 lines):

diff -r f58ec27b8941 -r 3120ce63433d ChangeLog
--- a/ChangeLog	Mon Nov 03 08:56:35 2008 -0500
+++ b/ChangeLog	Mon Nov 03 16:55:57 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-03  Gary Benson  <gbenson at redhat
+2008-11-03  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-alsa-default-device.patch: New patch. Use the ALSA 
+	'default' device if possible. Makes Java play nice with PulseAudio.
+
 2008-11-03  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
diff -r f58ec27b8941 -r 3120ce63433d Makefile.am
--- a/Makefile.am	Mon Nov 03 08:56:35 2008 -0500
+++ b/Makefile.am	Mon Nov 03 16:55:57 2008 -0500
@@ -532,7 +532,8 @@ ICEDTEA_PATCHES = \
 	$(VISUALVM_PATCH) \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
-	patches/icedtea-renderer-crossing.patch
+	patches/icedtea-renderer-crossing.patch \
+	patches/icedtea-alsa-default-device.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r f58ec27b8941 -r 3120ce63433d patches/icedtea-alsa-default-device.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-alsa-default-device.patch	Mon Nov 03 16:55:57 2008 -0500
@@ -0,0 +1,17 @@
+diff -uNr openjdk-orig/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c
+--- openjdk-orig/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	2008-11-03 15:02:16.000000000 -0500
++++ openjdk/jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_LinuxOS_ALSA_PCM.c	2008-11-03 15:08:07.000000000 -0500
+@@ -143,8 +143,12 @@
+             ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
+         } else {
+             ret = snd_pcm_hw_params_any(handle, hwParams);
+-            if (ret != 0) {
++            /* snd_pcm_hw_params_any can return a positive value on success too */
++            if (ret < 0) {
+                 ERROR1("snd_pcm_hw_params_any returned error %d\n", ret);
++            } else {
++                /* for the logic following this code, set ret to 0 to indicate success */
++                ret = 0;
+             }
+         }
+         snd_pcm_hw_params_get_format_mask(hwParams, formatMask);


From omajid at redhat.com  Mon Nov  3 14:15:14 2008
From: omajid at redhat.com (Omair Majid)
Date: Mon, 03 Nov 2008 22:15:14 +0000
Subject: changeset in /hg/icedtea6: 2008-11-03 Nix  <nix@esperi.org.uk>
Message-ID: <hg.835cdb193847.1225750514.2873452341184383832@icedtea.classpath.org>

changeset 835cdb193847 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=835cdb193847
description:
	2008-11-03 Nix  <nix at esperi.org.uk>
	           Omair Majid  <omajid at redhat.com>

	    * Makefile.am (ICEDTEA_PATCHES): Added icedtea-linker-libs-order.patch.
	    * patches/icedtea-linker-libs-order.patch: Fixes icedtea bug#237.

diffstat:

3 files changed, 74 insertions(+), 1 deletion(-)
ChangeLog                               |    6 ++
Makefile.am                             |    3 -
patches/icedtea-linker-libs-order.patch |   66 +++++++++++++++++++++++++++++++

diffs (96 lines):

diff -r 3120ce63433d -r 835cdb193847 ChangeLog
--- a/ChangeLog	Mon Nov 03 16:55:57 2008 -0500
+++ b/ChangeLog	Mon Nov 03 17:14:22 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-03  Omair Majid  <omajid at redhat.
+2008-11-03 Nix  <nix at esperi.org.uk>
+		   Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Added icedtea-linker-libs-order.patch.
+	* patches/icedtea-linker-libs-order.patch: Fixes icedtea bug#237.
+
 2008-11-03  Omair Majid  <omajid at redhat.com>
 
 	* patches/icedtea-alsa-default-device.patch: New patch. Use the ALSA 
diff -r 3120ce63433d -r 835cdb193847 Makefile.am
--- a/Makefile.am	Mon Nov 03 16:55:57 2008 -0500
+++ b/Makefile.am	Mon Nov 03 17:14:22 2008 -0500
@@ -533,7 +533,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
-	patches/icedtea-alsa-default-device.patch
+	patches/icedtea-alsa-default-device.patch \
+	patches/icedtea-linker-libs-order.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 3120ce63433d -r 835cdb193847 patches/icedtea-linker-libs-order.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-linker-libs-order.patch	Mon Nov 03 17:14:22 2008 -0500
@@ -0,0 +1,66 @@
+diff -durN openjdk-orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
+--- openjdk-orig/jdk/make/common/shared/Sanity.gmk	2008-10-27 00:25:33.000000000 +0000
++++ openjdk/jdk/make/common/shared/Sanity.gmk	2008-10-28 21:42:16.000000000 +0000
+@@ -1397,7 +1397,7 @@
+ ifdef ALSA_VERSION_CHECK
+ $(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
+ 	@$(prep-target)
+-	@$(CC) -lasound -o $@ $<
++	@$(CC) -o $@ $< -lasound
+ 
+ $(ALSA_VERSION_CHECK).c:
+ 	@$(prep-target)
+diff -durN openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
+--- openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile	2008-08-28 09:10:50.000000000 +0100
++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile	2008-10-28 21:55:27.000000000 +0000
+@@ -65,7 +65,7 @@
+ 	$(MIDIFILES_export) \
+ 	$(PORTFILES_export)
+ 
+-LDFLAGS += -lasound
++OTHER_LDLIBS += -lasound
+ 
+ CPPFLAGS += \
+ 	-DUSE_DAUDIO=TRUE \
+diff -durN openjdk-orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
+--- openjdk-orig/jdk/make/com/sun/java/pack/Makefile	2008-10-27 00:25:30.000000000 +0000
++++ openjdk/jdk/make/com/sun/java/pack/Makefile	2008-10-28 23:27:55.000000000 +0000
+@@ -75,12 +75,12 @@
+             $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
+             $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
+ 
+-  OTHER_LDLIBS += -lz
+ else
+   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
+-  OTHER_LDLIBS += -lz $(JVMLIB)
++  OTHER_LDLIBS += $(JVMLIB)
+ endif
+ 
++OTHER_LDLIBS += -lz
+ CXXFLAGS_DBG += -DFULL
+ CXXFLAGS_OPT += -DPRODUCT
+ CXXFLAGS_COMMON += -DFULL
+@@ -100,12 +100,11 @@
+   COMPILER_WARNINGS_FATAL=false
+ else
+   LDOUTPUT = -o #Have a space 
+-  LDDFLAGS += -lz -lc
+-  OTHER_LDLIBS  += $(LIBCXX)
++  OTHER_LDLIBS += $(LIBCXX) -lc
+ # setup the list of libraries to link in...
+ ifeq ($(PLATFORM), linux)
+ ifeq ("$(CC_VER_MAJOR)", "3")
+-  OTHER_LDLIBS  += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
++  OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
+ endif
+ endif #LINUX
+ endif #PLATFORM
+@@ -142,7 +141,7 @@
+ 
+ $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres 
+ 	$(prep-target)
+-	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
++	$(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
+ 	$(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
+ 
+ 


From bugzilla-daemon at icedtea.classpath.org  Mon Nov  3 17:02:46 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 04 Nov 2008 01:02:46 +0000
Subject: [Bug 245] New: talendOpenStudio Crashes. Log file pasted in
	description (Issue is repeatable)
Message-ID: <E1KxAJi-0002OO-GV@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=245

           Summary: talendOpenStudio Crashes.  Log file pasted in
                    description (Issue is repeatable)
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: vlis.email at gmail.com


Computer: Compaq Presario V2570nr
Processor: AMD Turion ML-32 (Single Core)
Speed 1800 MHZ
Memory: 2 GB
CPU Family: 15
CPU Id level: 1

Partial Log file below 
#
# An unexpected error has been detected by Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x00007f6d4dbbe00a, pid=5213, tid=1092512080
#
# Java VM: IcedTea 64-Bit Server VM (1.7.0-b24 mixed mode linux-amd64)
# Problematic frame:
# V  [libjvm.so+0x1fe00a]
#
# If you would like to submit a bug report, please visit:
#   http://icedtea.classpath.org/bugzilla
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#

---------------  T H R E A D  ---------------

Current thread (0x00000000006fa800):  JavaThread "CompilerThread0" daemon
[_thread_in_native, id=5219, stack(0x00000000410e6000,0x00000000411e7000)]

siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR),
si_addr=0x0000000000000000

Registers:
RAX=0x0000000000000000, RBX=0x000000000208ff10, RCX=0x000000000207d350,
RDX=0x0000000000000057
RSP=0x00000000411e2fb0, RBP=0x00000000411e3010, RSI=0x00000000411e4700,
RDI=0x0000000000a358d0
R8 =0x0000000000000002, R9 =0x0000000000000000, R10=0x0000000000000000,
R11=0x00007f6d4df3eff0
R12=0x0000000000000000, R13=0x000000000208ff48, R14=0x0000000000000001,
R15=0x0000000000a358d0
RIP=0x00007f6d4dbbe00a, EFL=0x0000000000010246, CSGSFS=0x0000000000000033,
ERR=0x0000000000000004
  TRAPNO=0x000000000000000e


---------------  S Y S T E M  ---------------

OS:openSUSE 11.0 (X86-64)
VERSION = 11.0

uname:Linux 2.6.25.18-0.2-default #1 SMP 2008-10-21 16:30:26 +0200 x86_64
libc:glibc 2.8 NPTL 2.8
rlimit: STACK 8192k, CORE 0k, NPROC 15351, NOFILE 8192, AS 9935680k
load average:1.89 1.00 0.66

CPU:total 1 (1 cores per cpu, 1 threads per core) family 15 model 36 stepping
2, cmov, cx8, fxsr, mmx, sse, sse2, sse3, mmxext, 3dnow, 3dnowext

Memory: 4k page, physical 1929136k(343656k free), swap 10490436k(10490408k
free)

vm_info: IcedTea 64-Bit Server VM (1.7.0-b24) for linux-amd64 JRE (1.7.0-b24),
built on Jun  8 2008 10:21:56 by "abuild" with gcc 4.3.1 20080507 (prerelease)
[gcc-4_3-branch revision 135036]

time: Mon Nov  3 18:23:44 2008
elapsed time: 88 seconds


I can email complete logs (Logs are greater than 65K)


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov  4 00:41:43 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 04 Nov 2008 08:41:43 +0000
Subject: [Bug 245] talendOpenStudio Crashes. Log file pasted in description
	(Issue is repeatable)
Message-ID: <E1KxHTr-00030O-Q8@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=245





------- Comment #1 from mark at klomp.org  2008-11-04 08:41 -------
This version of IcedTea is almost a year old. Could you try against a newer
version?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Tue Nov  4 01:30:09 2008
From: mark at klomp.org (Mark Wielaard)
Date: Tue, 04 Nov 2008 10:30:09 +0100
Subject: Bug in pisces Renderer (uninitialized crossings)
In-Reply-To: <1225119212.3329.29.camel@dijkstra.wildebeest.org>
References: <1225119212.3329.29.camel@dijkstra.wildebeest.org>
Message-ID: <1225791009.3320.4.camel@dijkstra.wildebeest.org>

Hi,

If anybody would take a look at this fix that would be appreciated.

Thanks,

Mark

On Mon, 2008-10-27 at 15:53 +0100, Mark Wielaard wrote:
> There is a bug in the pisces Renderer in crossingListFinished(). Both
> crossings and crossingIndices might not have been initialized, so have
> to be checked for being null. They only get initialized if
> setCrossingsExtents() was called earlier, which might not always be the
> case when crossingListFinished() is called from _endRendering().
> 
> You can see this with for example this applet (you will need to have the
> IcedTeaPlugin installed):
> http://www.jroller.com/dgilbert/entry/jfreechart_and_jxlayer
> The magnifying glass will not work, and you will get an exception:
> Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
>   at sun.java2d.pisces.Renderer.crossingListFinished(Renderer.java:778)
>   at sun.java2d.pisces.Renderer._endRendering(Renderer.java:466)
>   at sun.java2d.pisces.Renderer.endRendering(Renderer.java:478)
>   at sun.java2d.pisces.PiscesRenderingEngine.getAATileGenerator(PiscesRenderingEngine.java:327)
>   at sun.java2d.pipe.AAShapePipe.renderPath(AAShapePipe.java:93)
>   at sun.java2d.pipe.AAShapePipe.fill(AAShapePipe.java:65)
>   at sun.java2d.pipe.ValidatePipe.fill(ValidatePipe.java:160)
>   at sun.java2d.SunGraphics2D.fill(SunGraphics2D.java:2422)
>   at org.jfree.chart.plot.Plot.fillBackground(Plot.java:1021)
> [...]
> 
> Attached is the workaround that I checked into IcedTea to make this work
> reliably:
> 
> 2008-10-27  Mark Wielaard  <mark at klomp.org>
> 
>         * patches/icedtea-renderer-crossing.patch: New patch.
>         * Makefile.am (ICEDTEA_PATCHES): Add new patch.
>         * HACKING: Document new patch.
> 
> Cheers,
> 
> Mark



From bugzilla-daemon at icedtea.classpath.org  Tue Nov  4 04:57:47 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 04 Nov 2008 12:57:47 +0000
Subject: [Bug 246] New: Error using Nordea Homebanking
Message-ID: <E1KxLTf-0003EO-2a@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=246

           Summary: Error using Nordea Homebanking
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P1
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: nikolaj at sheller.dk


When attempting a monetary transfer, the following error occurs:

IMPLEMENTED: virtual nsresult IcedTeaPluginInstance::Stop()
NOT IMPLEMENTED: virtual nsresult IcedTeaPluginInstance::Start()

Seen on Ubuntu 8.10 Intrepid Ibex 
2.6.27-7-generic #1 SMP Thu Oct 30 04:12:22 UTC 2008 x86_64 GNU/Linux
icedtea6-plugin 6b12-0ubuntu6

Applet in question:
https://www.netbank.nordea.dk/netbank/index.jsp

I can't explain how to reproduce the problem as it requires the user to be
logged in.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From gbenson at redhat.com  Tue Nov  4 05:55:43 2008
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 04 Nov 2008 13:55:43 +0000
Subject: changeset in /hg/icedtea6: 2008-11-04  Gary Benson  <gbenson@red...
Message-ID: <hg.69e3a572fc2c.1225806942.2873452341184383832@icedtea.classpath.org>

changeset 69e3a572fc2c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=69e3a572fc2c
description:
	2008-11-04  Gary Benson  <gbenson at redhat.com>

		PR icedtea/244:
		* patches/icedtea-f2i-overflow.patch: New file.
		* Makefile.am (ICEDTEA_PATCHES): Apply the above.
		* HACKING: Document the above.

diffstat:

4 files changed, 107 insertions(+), 3 deletions(-)
ChangeLog                          |    7 ++
HACKING                            |    4 -
Makefile.am                        |    3 -
patches/icedtea-f2i-overflow.patch |   96 ++++++++++++++++++++++++++++++++++++

diffs (141 lines):

diff -r 835cdb193847 -r 69e3a572fc2c ChangeLog
--- a/ChangeLog	Mon Nov 03 17:14:22 2008 -0500
+++ b/ChangeLog	Tue Nov 04 08:54:30 2008 -0500
@@ -1,3 +1,10 @@ 2008-11-03 Nix  <nix at esperi.org.uk>
+2008-11-04  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/244:
+	* patches/icedtea-f2i-overflow.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2008-11-03 Nix  <nix at esperi.org.uk>
 		   Omair Majid  <omajid at redhat.com>
 
diff -r 835cdb193847 -r 69e3a572fc2c HACKING
--- a/HACKING	Mon Nov 03 17:14:22 2008 -0500
+++ b/HACKING	Tue Nov 04 08:54:30 2008 -0500
@@ -62,8 +62,8 @@ The following patches are currently appl
 * icedtea-arch.patch: Add support for additional architectures.
 * icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
-* patches/icedtea-renderer-crossing.patch: Check whether crossing is
-  initialized in Pisces Renderer.
+* icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
+* icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 835cdb193847 -r 69e3a572fc2c Makefile.am
--- a/Makefile.am	Mon Nov 03 17:14:22 2008 -0500
+++ b/Makefile.am	Tue Nov 04 08:54:30 2008 -0500
@@ -534,7 +534,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
 	patches/icedtea-alsa-default-device.patch \
-	patches/icedtea-linker-libs-order.patch
+	patches/icedtea-linker-libs-order.patch \
+	patches/icedtea-f2i-overflow.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 835cdb193847 -r 69e3a572fc2c patches/icedtea-f2i-overflow.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-f2i-overflow.patch	Tue Nov 04 08:54:30 2008 -0500
@@ -0,0 +1,96 @@
+diff -r dcb49b482348 -r f63a8dee04ae openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp
+--- openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Mon Nov 03 14:00:57 2008 +0000
++++ openjdk/hotspot/src/share/vm/runtime/sharedRuntime.cpp	Mon Nov 03 15:56:17 2008 +0000
+@@ -173,64 +173,46 @@ JRT_END
+ 
+ 
+ JRT_LEAF(jint, SharedRuntime::f2i(jfloat  x))
+-  if (g_isnan(x)) {return 0;}
+-  jlong lltmp = (jlong)x;
+-  jint ltmp   = (jint)lltmp;
+-  if (ltmp == lltmp) {
+-    return ltmp;
+-  } else {
+-    if (x < 0) {
+-      return min_jint;
+-    } else {
+-      return max_jint;
+-    }
+-  }
++  if (g_isnan(x))
++    return 0;
++  if (x >= (jfloat) max_jint)
++    return max_jint;
++  if (x <= (jfloat) min_jint)
++    return min_jint;
++  return (jint) x;
+ JRT_END
+ 
+ 
+ JRT_LEAF(jlong, SharedRuntime::f2l(jfloat  x))  
+-  if (g_isnan(x)) {return 0;}
+-  jlong lltmp = (jlong)x;
+-  if (lltmp != min_jlong) {
+-    return lltmp;
+-  } else {
+-    if (x < 0) {
+-      return min_jlong;
+-    } else {
+-      return max_jlong;
+-    }
+-  }
++  if (g_isnan(x))
++    return 0;
++  if (x >= (jfloat) max_jlong)
++    return max_jlong;
++  if (x <= (jfloat) min_jlong)
++    return min_jlong;
++  return (jlong) x;
+ JRT_END
+ 
+ 
+ JRT_LEAF(jint, SharedRuntime::d2i(jdouble x))
+-  if (g_isnan(x)) {return 0;}
+-  jlong lltmp = (jlong)x;
+-  jint ltmp   = (jint)lltmp;
+-  if (ltmp == lltmp) {
+-    return ltmp;
+-  } else {
+-    if (x < 0) {
+-      return min_jint;
+-    } else {
+-      return max_jint;
+-    }
+-  }
++  if (g_isnan(x))
++    return 0;
++  if (x >= (jdouble) max_jint)
++    return max_jint;
++  if (x <= (jdouble) min_jint)
++    return min_jint;
++  return (jint) x;
+ JRT_END
+ 
+ 
+ JRT_LEAF(jlong, SharedRuntime::d2l(jdouble x))
+-  if (g_isnan(x)) {return 0;}
+-  jlong lltmp = (jlong)x;
+-  if (lltmp != min_jlong) {
+-    return lltmp;
+-  } else {
+-    if (x < 0) {
+-      return min_jlong;
+-    } else {
+-      return max_jlong;
+-    }
+-  }
++  if (g_isnan(x))
++    return 0;
++  if (x >= (jdouble) max_jlong)
++    return max_jlong;
++  if (x <= (jdouble) min_jlong)
++    return min_jlong;
++  return (jlong) x;
+ JRT_END
+ 
+ 


From gbenson at redhat.com  Tue Nov  4 06:46:05 2008
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 04 Nov 2008 14:46:05 +0000
Subject: changeset in /hg/icedtea6: 2008-11-04  Gary Benson  <gbenson@red...
Message-ID: <hg.2a9a995b582d.1225809928.2873452341184383832@icedtea.classpath.org>

changeset 2a9a995b582d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2a9a995b582d
description:
	2008-11-04  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::parse): Fix syntax errors.

diffstat:

2 files changed, 8 insertions(+), 3 deletions(-)
ChangeLog                                       |    5 +++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp |    6 +++---

diffs (42 lines):

diff -r 69e3a572fc2c -r 2a9a995b582d ChangeLog
--- a/ChangeLog	Tue Nov 04 08:54:30 2008 -0500
+++ b/ChangeLog	Tue Nov 04 09:31:55 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-04  Gary Benson  <gbenson at redhat
+2008-11-04  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse): Fix syntax errors.
+
 2008-11-04  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/244:
diff -r 69e3a572fc2c -r 2a9a995b582d ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 04 08:54:30 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 04 09:31:55 2008 -0500
@@ -489,7 +489,7 @@ void SharkBlock::parse()
         builder()->CreateShl(
           a->jint_value(),
           builder()->CreateAnd(
-            b->jint_value(), LLVMValue::jint_constant(0x1f))));
+            b->jint_value(), LLVMValue::jint_constant(0x1f)))));
       break;
     case Bytecodes::_ishr:
       b = pop();
@@ -498,7 +498,7 @@ void SharkBlock::parse()
         builder()->CreateAShr(
           a->jint_value(),
           builder()->CreateAnd(
-            b->jint_value(), LLVMValue::jint_constant(0x1f))));
+            b->jint_value(), LLVMValue::jint_constant(0x1f)))));
       break;
     case Bytecodes::_iushr:
       b = pop();
@@ -507,7 +507,7 @@ void SharkBlock::parse()
         builder()->CreateLShr(
           a->jint_value(),
           builder()->CreateAnd(
-            b->jint_value(), LLVMValue::jint_constant(0x1f))));
+            b->jint_value(), LLVMValue::jint_constant(0x1f)))));
       break;
     case Bytecodes::_iand:
       b = pop();


From omajid at redhat.com  Tue Nov  4 08:02:45 2008
From: omajid at redhat.com (Omair Majid)
Date: Tue, 04 Nov 2008 16:02:45 +0000
Subject: changeset in /hg/icedtea6: 2008-11-04  Omair Majid  <omajid@redh...
Message-ID: <hg.f9592f3296d6.1225814565.2873452341184383832@icedtea.classpath.org>

changeset f9592f3296d6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f9592f3296d6
description:
	2008-11-04  Omair Majid  <omajid at redhat.com>

	    * Makefile.am (stamps/pulse-java.stamp): Link in libpulse.so after all
	    the object files that use it.
	    * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
	    (testWriteIntegralNumberFrames): New function. Tests that a SourceDataLine
	    will only write an integral number of frames.
	    (testWriteNegativeLength): New function. Tests that a
	    SourceDataLine.write() wont accept a negative length.
	    (testWriteNegativeOffset): New function. Tests that a
	    SourceDataLine.write() will not accept a negative offset.
	    (testWriteMoreThanArrayLength): New function. Tests that
	    SourceDataLine.write() wont write more than the length of the array.
	    (testWriteMoreThanArrayLength2): Likewise.
	    (testWriteWithoutStart): Added a check to avoid throwing an
	    IllegalStateException.

diffstat:

3 files changed, 86 insertions(+), 2 deletions(-)
ChangeLog                                                                               |   17 ++
Makefile.am                                                                             |    2 
pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java |   69 +++++++++-

diffs (133 lines):

diff -r 2a9a995b582d -r f9592f3296d6 ChangeLog
--- a/ChangeLog	Tue Nov 04 09:31:55 2008 -0500
+++ b/ChangeLog	Tue Nov 04 11:00:50 2008 -0500
@@ -1,3 +1,20 @@ 2008-11-04  Gary Benson  <gbenson at redhat
+2008-11-04  Omair Majid  <omajid at redhat.com>
+
+	* Makefile.am (stamps/pulse-java.stamp): Link in libpulse.so after all
+	the object files that use it.
+	* pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
+	(testWriteIntegralNumberFrames): New function. Tests that a SourceDataLine
+	will only write an integral number of frames.
+	(testWriteNegativeLength): New function. Tests that a
+	SourceDataLine.write() wont accept a negative length.
+	(testWriteNegativeOffset): New function. Tests that a
+	SourceDataLine.write() will not accept a negative offset.
+	(testWriteMoreThanArrayLength): New function. Tests that
+	SourceDataLine.write() wont write more than the length of the array.
+	(testWriteMoreThanArrayLength2): Likewise.
+	(testWriteWithoutStart): Added a check to avoid throwing an
+	IllegalStateException.
+
 2008-11-04  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
diff -r 2a9a995b582d -r f9592f3296d6 Makefile.am
--- a/Makefile.am	Tue Nov 04 09:31:55 2008 -0500
+++ b/Makefile.am	Tue Nov 04 11:00:50 2008 -0500
@@ -1474,7 +1474,7 @@ if ENABLE_PULSE_JAVA
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c 
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
-	$(CC) $(LDFLAGS) -shared $(LIBPULSE_LIBS) -o libpulse-java.so org_*pulseaudio*.o jni-common.o
+	$(CC) $(LDFLAGS) -shared org_*pulseaudio*.o jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so 
 	mv org_classpath_icedtea_pulseaudio_*.o $(PULSE_JAVA_CLASS_DIR)
 	mv jni-common.o $(PULSE_JAVA_CLASS_DIR)
 endif
diff -r 2a9a995b582d -r f9592f3296d6 pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java
--- a/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java	Tue Nov 04 09:31:55 2008 -0500
+++ b/pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java	Tue Nov 04 11:00:50 2008 -0500
@@ -227,6 +227,66 @@ public class PulseAudioSourceDataLineTes
 
 	}
 
+	@Test(expected = IllegalArgumentException.class)
+	public void testWriteIntegralNumberFrames() throws LineUnavailableException {
+		sourceDataLine = (SourceDataLine) mixer.getLine(new Line.Info(
+				SourceDataLine.class));
+
+		/* try writing an non-integral number of frames size */
+		sourceDataLine.open();
+		int frameSize = sourceDataLine.getFormat().getFrameSize();
+		byte[] buffer = new byte[(frameSize * 2) - 1];
+		sourceDataLine.write(buffer, 0, buffer.length);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void testWriteNegativeLength() throws LineUnavailableException {
+		sourceDataLine = (SourceDataLine) mixer.getLine(new Line.Info(
+				SourceDataLine.class));
+
+		sourceDataLine.open();
+		int frameSize = sourceDataLine.getFormat().getFrameSize();
+		byte[] buffer = new byte[(frameSize * 2)];
+		/* try writing a negative length */
+		sourceDataLine.write(buffer, 0, -2);
+	}
+
+	@Test(expected = ArrayIndexOutOfBoundsException.class)
+	public void testWriteNegativeOffset() throws LineUnavailableException {
+		sourceDataLine = (SourceDataLine) mixer.getLine(new Line.Info(
+				SourceDataLine.class));
+
+		sourceDataLine.open();
+		int frameSize = sourceDataLine.getFormat().getFrameSize();
+		byte[] buffer = new byte[(frameSize * 2)];
+		/* try writing with a negative offset */
+		sourceDataLine.write(buffer, -1, buffer.length);
+	}
+
+	@Test(expected = ArrayIndexOutOfBoundsException.class)
+	public void testWriteMoreThanArrayLength() throws LineUnavailableException {
+		sourceDataLine = (SourceDataLine) mixer.getLine(new Line.Info(
+				SourceDataLine.class));
+
+		sourceDataLine.open();
+		int frameSize = sourceDataLine.getFormat().getFrameSize();
+		byte[] buffer = new byte[(frameSize * 2)];
+		/* try writing more than the array length */
+		sourceDataLine.write(buffer, 0, frameSize * 3);
+	}
+
+	@Test(expected = ArrayIndexOutOfBoundsException.class)
+	public void testWriteMoreThanArrayLength2() throws LineUnavailableException {
+		sourceDataLine = (SourceDataLine) mixer.getLine(new Line.Info(
+				SourceDataLine.class));
+
+		sourceDataLine.open();
+		int frameSize = sourceDataLine.getFormat().getFrameSize();
+		byte[] buffer = new byte[(frameSize * 2)];
+		/* try writing more than the array length */
+		sourceDataLine.write(buffer, 1, buffer.length);
+	}
+
 	@Test
 	public void testWriteWithoutStart() throws UnsupportedAudioFileException,
 			IOException, LineUnavailableException, InterruptedException {
@@ -253,10 +313,17 @@ public class PulseAudioSourceDataLineTes
 					int total = 0;
 
 					while (bytesRead >= 0 && total < 50) {
+
 						bytesRead = audioInputStream.read(abData, 0,
 								abData.length);
 						if (bytesRead > 0) {
 							sourceDataLine.write(abData, 0, bytesRead);
+						}
+						
+						// when the line is closed (in tearDown),
+						// break out of the loop
+						if (!sourceDataLine.isOpen()) {
+							break;
 						}
 						total++;
 					}
@@ -273,7 +340,7 @@ public class PulseAudioSourceDataLineTes
 
 		Thread.sleep(100);
 
-		writer.join(1000);
+		writer.join(2000);
 
 		/* assert that the writer is still waiting in write */
 		Assert.assertTrue(writer.isAlive());


From gbenson at redhat.com  Tue Nov  4 08:34:30 2008
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 04 Nov 2008 16:34:30 +0000
Subject: changeset in /hg/icedtea6: 2008-11-04  Gary Benson  <gbenson@red...
Message-ID: <hg.1fa9f674cf4d.1225816470.2873452341184383832@icedtea.classpath.org>

changeset 1fa9f674cf4d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1fa9f674cf4d
description:
	2008-11-04  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
		(SharkRuntime::_f2i): New constant.
		(SharkRuntime::_f2l): Likewise.
		(SharkRuntime::_d2i): Likewise.
		(SharkRuntime::_d2l): Likewise.
		(SharkRuntime::f2i): New accessor.
		(SharkRuntime::f2l): Likewise.
		(SharkRuntime::d2i): Likewise.
		(SharkRuntime::d2l): Likewise.
		* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
		(SharkRuntime::_f2i): New constant.
		(SharkRuntime::_f2l): Likewise.
		(SharkRuntime::_d2i): Likewise.
		(SharkRuntime::_d2l): Likewise.
		(SharkRuntime::initialize): Initialize the above.
		* ports/hotspot/src/share/vm/shark/sharkBlock.hpp
		(SharkBlock::call_vm_leaf): New method.
		* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
		(SharkBlock::parse): Use runtime calls for f2i, f2l, d2i and d2l.

diffstat:

5 files changed, 85 insertions(+), 8 deletions(-)
ChangeLog                                         |   22 ++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp   |   12 +++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp   |    6 ++++
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp |   28 +++++++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp |   25 ++++++++++++++++++

diffs (160 lines):

diff -r 2a9a995b582d -r 1fa9f674cf4d ChangeLog
--- a/ChangeLog	Tue Nov 04 09:31:55 2008 -0500
+++ b/ChangeLog	Tue Nov 04 11:24:16 2008 -0500
@@ -1,3 +1,25 @@ 2008-11-04  Gary Benson  <gbenson at redhat
+2008-11-04  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
+	(SharkRuntime::_f2i): New constant.
+	(SharkRuntime::_f2l): Likewise.
+	(SharkRuntime::_d2i): Likewise.
+	(SharkRuntime::_d2l): Likewise.
+	(SharkRuntime::f2i): New accessor.
+	(SharkRuntime::f2l): Likewise.
+	(SharkRuntime::d2i): Likewise.
+	(SharkRuntime::d2l): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
+	(SharkRuntime::_f2i): New constant.
+	(SharkRuntime::_f2l): Likewise.
+	(SharkRuntime::_d2i): Likewise.
+	(SharkRuntime::_d2l): Likewise.
+	(SharkRuntime::initialize): Initialize the above.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp
+	(SharkBlock::call_vm_leaf): New method.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse): Use runtime calls for f2i, f2l, d2i and d2l.
+
 2008-11-04  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
diff -r 2a9a995b582d -r 1fa9f674cf4d ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 04 09:31:55 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 04 11:24:16 2008 -0500
@@ -742,13 +742,11 @@ void SharkBlock::parse()
 
     case Bytecodes::_f2i:
       push(SharkValue::create_jint(
-        builder()->CreateFPToSI(
-          pop()->jfloat_value(), SharkType::jint_type())));
+        call_vm_leaf(SharkRuntime::f2i(), pop()->jfloat_value())));
       break;
     case Bytecodes::_f2l:
       push(SharkValue::create_jlong(
-        builder()->CreateFPToSI(
-          pop()->jfloat_value(), SharkType::jlong_type())));
+        call_vm_leaf(SharkRuntime::f2l(), pop()->jfloat_value())));
       break;
     case Bytecodes::_f2d:
       push(SharkValue::create_jdouble(
@@ -758,13 +756,11 @@ void SharkBlock::parse()
 
     case Bytecodes::_d2i:
       push(SharkValue::create_jint(
-        builder()->CreateFPToSI(
-          pop()->jdouble_value(), SharkType::jint_type())));
+        call_vm_leaf(SharkRuntime::d2i(), pop()->jdouble_value())));
       break;
     case Bytecodes::_d2l:
       push(SharkValue::create_jlong(
-        builder()->CreateFPToSI(
-          pop()->jdouble_value(), SharkType::jlong_type())));
+        call_vm_leaf(SharkRuntime::d2l(), pop()->jdouble_value())));
       break;
     case Bytecodes::_d2f:
       push(SharkValue::create_jfloat(
diff -r 2a9a995b582d -r 1fa9f674cf4d ports/hotspot/src/share/vm/shark/sharkBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Nov 04 09:31:55 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Nov 04 11:24:16 2008 -0500
@@ -371,6 +371,12 @@ class SharkBlock : public ResourceObj {
     return call_vm_nocheck(callee, args, args + 4);
   }
 
+  llvm::CallInst* call_vm_leaf(llvm::Constant* callee,
+                               llvm::Value*    arg1)
+  {
+    return builder()->CreateCall(callee, arg1);
+  }
+
   // Whole-method synchronization
  public:
   void acquire_method_lock();  
diff -r 2a9a995b582d -r 1fa9f674cf4d ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp	Tue Nov 04 09:31:55 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp	Tue Nov 04 11:24:16 2008 -0500
@@ -43,6 +43,11 @@ Constant* SharkRuntime::_throw_NullPoint
 Constant* SharkRuntime::_throw_NullPointerException;
 Constant* SharkRuntime::_trace_bytecode;
 
+Constant* SharkRuntime::_f2i;
+Constant* SharkRuntime::_f2l;
+Constant* SharkRuntime::_d2i;
+Constant* SharkRuntime::_d2l;
+
 Constant* SharkRuntime::_dump;
 Constant* SharkRuntime::_is_subtype_of;
 Constant* SharkRuntime::_should_not_reach_here;
@@ -158,6 +163,29 @@ void SharkRuntime::initialize(SharkBuild
     FunctionType::get(Type::VoidTy, params, false),
     "SharkRuntime__trace_bytecode");
 
+  // Leaf calls
+  params.clear();
+  params.push_back(SharkType::jfloat_type());
+  _f2i = builder->make_function(
+    (intptr_t) SharedRuntime::f2i,
+    FunctionType::get(SharkType::jint_type(), params, false),
+    "SharedRuntime__f2i");  
+  _f2l = builder->make_function(
+    (intptr_t) SharedRuntime::f2l,
+    FunctionType::get(SharkType::jlong_type(), params, false),
+    "SharedRuntime__f2l");  
+
+  params.clear();
+  params.push_back(SharkType::jdouble_type());
+  _d2i = builder->make_function(
+    (intptr_t) SharedRuntime::d2i,
+    FunctionType::get(SharkType::jint_type(), params, false),
+    "SharedRuntime__d2i");  
+  _d2l = builder->make_function(
+    (intptr_t) SharedRuntime::d2l,
+    FunctionType::get(SharkType::jlong_type(), params, false),
+    "SharedRuntime__d2l");  
+  
   // Non-VM calls
   params.clear();
   params.push_back(SharkType::intptr_type());
diff -r 2a9a995b582d -r 1fa9f674cf4d ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp	Tue Nov 04 09:31:55 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp	Tue Nov 04 11:24:16 2008 -0500
@@ -162,6 +162,31 @@ class SharkRuntime : public AllStatic {
     return *(thread->zero_stack()->sp() + offset);
   }  
 
+  // Leaf calls
+ private:
+  static llvm::Constant* _f2i;
+  static llvm::Constant* _f2l;
+  static llvm::Constant* _d2i;
+  static llvm::Constant* _d2l;
+
+ public:
+  static llvm::Constant* f2i()
+  {
+    return _f2i;
+  }  
+  static llvm::Constant* f2l()
+  {
+    return _f2l;
+  }  
+  static llvm::Constant* d2i()
+  {
+    return _d2i;
+  }  
+  static llvm::Constant* d2l()
+  {
+    return _d2l;
+  }  
+  
   // Non-VM calls
  private:
   static llvm::Constant* _dump;


From gbenson at redhat.com  Tue Nov  4 08:36:45 2008
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 04 Nov 2008 16:36:45 +0000
Subject: changeset in /hg/icedtea6: Merge
Message-ID: <hg.74930fcb28d8.1225816603.2873452341184383832@icedtea.classpath.org>

changeset 74930fcb28d8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=74930fcb28d8
description:
	Merge

diffstat:

5 files changed, 85 insertions(+), 8 deletions(-)
ChangeLog                                         |   22 ++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp   |   12 +++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp   |    6 ++++
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp |   28 +++++++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp |   25 ++++++++++++++++++

diffs (160 lines):

diff -r f9592f3296d6 -r 74930fcb28d8 ChangeLog
--- a/ChangeLog	Tue Nov 04 11:00:50 2008 -0500
+++ b/ChangeLog	Tue Nov 04 11:32:33 2008 -0500
@@ -1,3 +1,25 @@ 2008-11-04  Omair Majid  <omajid at redhat.
+2008-11-04  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
+	(SharkRuntime::_f2i): New constant.
+	(SharkRuntime::_f2l): Likewise.
+	(SharkRuntime::_d2i): Likewise.
+	(SharkRuntime::_d2l): Likewise.
+	(SharkRuntime::f2i): New accessor.
+	(SharkRuntime::f2l): Likewise.
+	(SharkRuntime::d2i): Likewise.
+	(SharkRuntime::d2l): Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
+	(SharkRuntime::_f2i): New constant.
+	(SharkRuntime::_f2l): Likewise.
+	(SharkRuntime::_d2i): Likewise.
+	(SharkRuntime::_d2l): Likewise.
+	(SharkRuntime::initialize): Initialize the above.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp
+	(SharkBlock::call_vm_leaf): New method.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::parse): Use runtime calls for f2i, f2l, d2i and d2l.
+
 2008-11-04  Omair Majid  <omajid at redhat.com>
 
 	* Makefile.am (stamps/pulse-java.stamp): Link in libpulse.so after all
diff -r f9592f3296d6 -r 74930fcb28d8 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 04 11:00:50 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 04 11:32:33 2008 -0500
@@ -742,13 +742,11 @@ void SharkBlock::parse()
 
     case Bytecodes::_f2i:
       push(SharkValue::create_jint(
-        builder()->CreateFPToSI(
-          pop()->jfloat_value(), SharkType::jint_type())));
+        call_vm_leaf(SharkRuntime::f2i(), pop()->jfloat_value())));
       break;
     case Bytecodes::_f2l:
       push(SharkValue::create_jlong(
-        builder()->CreateFPToSI(
-          pop()->jfloat_value(), SharkType::jlong_type())));
+        call_vm_leaf(SharkRuntime::f2l(), pop()->jfloat_value())));
       break;
     case Bytecodes::_f2d:
       push(SharkValue::create_jdouble(
@@ -758,13 +756,11 @@ void SharkBlock::parse()
 
     case Bytecodes::_d2i:
       push(SharkValue::create_jint(
-        builder()->CreateFPToSI(
-          pop()->jdouble_value(), SharkType::jint_type())));
+        call_vm_leaf(SharkRuntime::d2i(), pop()->jdouble_value())));
       break;
     case Bytecodes::_d2l:
       push(SharkValue::create_jlong(
-        builder()->CreateFPToSI(
-          pop()->jdouble_value(), SharkType::jlong_type())));
+        call_vm_leaf(SharkRuntime::d2l(), pop()->jdouble_value())));
       break;
     case Bytecodes::_d2f:
       push(SharkValue::create_jfloat(
diff -r f9592f3296d6 -r 74930fcb28d8 ports/hotspot/src/share/vm/shark/sharkBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Nov 04 11:00:50 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Nov 04 11:32:33 2008 -0500
@@ -371,6 +371,12 @@ class SharkBlock : public ResourceObj {
     return call_vm_nocheck(callee, args, args + 4);
   }
 
+  llvm::CallInst* call_vm_leaf(llvm::Constant* callee,
+                               llvm::Value*    arg1)
+  {
+    return builder()->CreateCall(callee, arg1);
+  }
+
   // Whole-method synchronization
  public:
   void acquire_method_lock();  
diff -r f9592f3296d6 -r 74930fcb28d8 ports/hotspot/src/share/vm/shark/sharkRuntime.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp	Tue Nov 04 11:00:50 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.cpp	Tue Nov 04 11:32:33 2008 -0500
@@ -43,6 +43,11 @@ Constant* SharkRuntime::_throw_NullPoint
 Constant* SharkRuntime::_throw_NullPointerException;
 Constant* SharkRuntime::_trace_bytecode;
 
+Constant* SharkRuntime::_f2i;
+Constant* SharkRuntime::_f2l;
+Constant* SharkRuntime::_d2i;
+Constant* SharkRuntime::_d2l;
+
 Constant* SharkRuntime::_dump;
 Constant* SharkRuntime::_is_subtype_of;
 Constant* SharkRuntime::_should_not_reach_here;
@@ -158,6 +163,29 @@ void SharkRuntime::initialize(SharkBuild
     FunctionType::get(Type::VoidTy, params, false),
     "SharkRuntime__trace_bytecode");
 
+  // Leaf calls
+  params.clear();
+  params.push_back(SharkType::jfloat_type());
+  _f2i = builder->make_function(
+    (intptr_t) SharedRuntime::f2i,
+    FunctionType::get(SharkType::jint_type(), params, false),
+    "SharedRuntime__f2i");  
+  _f2l = builder->make_function(
+    (intptr_t) SharedRuntime::f2l,
+    FunctionType::get(SharkType::jlong_type(), params, false),
+    "SharedRuntime__f2l");  
+
+  params.clear();
+  params.push_back(SharkType::jdouble_type());
+  _d2i = builder->make_function(
+    (intptr_t) SharedRuntime::d2i,
+    FunctionType::get(SharkType::jint_type(), params, false),
+    "SharedRuntime__d2i");  
+  _d2l = builder->make_function(
+    (intptr_t) SharedRuntime::d2l,
+    FunctionType::get(SharkType::jlong_type(), params, false),
+    "SharedRuntime__d2l");  
+  
   // Non-VM calls
   params.clear();
   params.push_back(SharkType::intptr_type());
diff -r f9592f3296d6 -r 74930fcb28d8 ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp	Tue Nov 04 11:00:50 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkRuntime.hpp	Tue Nov 04 11:32:33 2008 -0500
@@ -162,6 +162,31 @@ class SharkRuntime : public AllStatic {
     return *(thread->zero_stack()->sp() + offset);
   }  
 
+  // Leaf calls
+ private:
+  static llvm::Constant* _f2i;
+  static llvm::Constant* _f2l;
+  static llvm::Constant* _d2i;
+  static llvm::Constant* _d2l;
+
+ public:
+  static llvm::Constant* f2i()
+  {
+    return _f2i;
+  }  
+  static llvm::Constant* f2l()
+  {
+    return _f2l;
+  }  
+  static llvm::Constant* d2i()
+  {
+    return _d2i;
+  }  
+  static llvm::Constant* d2l()
+  {
+    return _d2l;
+  }  
+  
   // Non-VM calls
  private:
   static llvm::Constant* _dump;


From aph at redhat.com  Wed Nov  5 06:56:18 2008
From: aph at redhat.com (Andrew Haley)
Date: Wed, 05 Nov 2008 14:56:18 +0000
Subject: contrib/mixtec-hacks.patch
Message-ID: <4911B412.8060809@redhat.com>

This is Gary's patch to enable in-VM debugging for Zero and Shark.

Andrew.


2008-11-05  Gary Benson  <gbenson at redhat.com>

        * contrib/mixtec-hacks.patch: new file.

diff -r 74930fcb28d8 contrib/mixtec-hacks.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/mixtec-hacks.patch	Wed Nov 05 14:55:46 2008 +0000
@@ -0,0 +1,104 @@
+diff -r 4f4d268762d7 Makefile.am
+--- a/Makefile.am	Wed Aug 20 04:24:45 2008 -0400
++++ b/Makefile.am	Thu Aug 28 03:53:35 2008 -0400
+@@ -442,6 +442,13 @@
+ endif
+
+ ICEDTEA_FSG_PATCHES =
++
++# Build with assertions and lowered optimization
++DISTRIBUTION_PATCHES = \
++	patches/mixtec-assertions.patch \
++	patches/mixtec-no-log-vm-output.patch \
++	patches/mixtec-no-print-vm-options.patch \
++	patches/mixtec-optimization.patch
+
+ ICEDTEA_PATCHES = \
+ 	$(ZERO_PATCHES_COND) \
+diff -r 4f4d268762d7 patches/mixtec-assertions.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-assertions.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,14 @@
++diff -r d384f5a5bd0c hotspot/build/linux/makefiles/product.make
++--- openjdk/hotspot/build/linux/makefiles/product.make	Mon Aug 06 13:11:51 2007 +0100
+++++ openjdk/hotspot/build/linux/makefiles/product.make	Fri Sep 14 09:58:33 2007 +0100
++@@ -41,8 +41,8 @@ MAPFILE = $(GAMMADIR)/build/linux/makefi
++ MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-product
++
++ G_SUFFIX =
++-SYSDEFS += -DPRODUCT
++-VERSION = optimized
+++SYSDEFS += -DASSERT
+++VERSION = mixtec
++
++ # use -g to strip library as -x will discard its symbol table; -x is fine for
++ # executables.
+diff -r 4f4d268762d7 patches/mixtec-no-log-vm-output.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-no-log-vm-output.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,11 @@
++--- openjdk-ecj/hotspot/src/share/vm/runtime/globals.hpp	2007-11-13 09:19:54.000000000 -0500
+++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2007-11-13 17:13:24.000000000 -0500
++@@ -2081,7 +2081,7 @@
++   diagnostic(bool, DisplayVMOutput, true,                                   \
++          "Display all VM output on the tty, independently of LogVMOutput")  \
++                                                                             \
++-  diagnostic(bool, LogVMOutput, trueInDebug,                                \
+++  diagnostic(bool, LogVMOutput, false,                                      \
++          "Save VM output to hotspot.log, or to LogFile")                    \
++                                                                             \
++   diagnostic(ccstr, LogFile, NULL,                                          \
+diff -r 4f4d268762d7 patches/mixtec-no-print-vm-options.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-no-print-vm-options.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,12 @@
++diff -r c5904941581b openjdk-ecj/hotspot/src/share/vm/runtime/globals.hpp
++--- openjdk/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 13 14:09:56 2007 +0000
+++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 13 14:19:54 2007 +0000
++@@ -2072,7 +2072,7 @@ class CommandLineFlags {
++   diagnostic(bool, DebugInlinedCalls, true,                                 \
++          "If false, restricts profiled locations to the root method only")  \
++                                                                             \
++-  product(bool, PrintVMOptions, trueInDebug,                                \
+++  product(bool, PrintVMOptions, false,                                      \
++          "print VM flag settings")                                          \
++                                                                             \
++   diagnostic(bool, SerializeVMOutput, true,                                 \
+diff -r 4f4d268762d7 patches/mixtec-optimization.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-optimization.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,34 @@
++diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
++--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-10-12 03:46:25.000000000 -0400
+++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-12 17:41:02.000000000 -0400
++@@ -111,7 +111,7 @@
++ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
++
++ # The flags to use for an Optimized g++ build
++-OPT_CFLAGS += -O3
+++OPT_CFLAGS += -O0
++
++ # Hotspot uses very unstrict aliasing turn this optimization off
++ OPT_CFLAGS += -fno-strict-aliasing
++diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
++--- openjdk.orig/jdk/make/common/Defs-linux.gmk	2007-10-12 03:54:05.000000000 -0400
+++++ openjdk/jdk/make/common/Defs-linux.gmk	2007-10-12 17:41:02.000000000 -0400
++@@ -97,6 +97,7 @@
++     _OPT = $(CC_LOWER_OPT)
++     CPPFLAGS_DBG    += -DLOGGING
++ endif
+++_OPT = -O0
++
++ # For all platforms, do not omit the frame pointer register usage.
++ #    We need this frame pointer to make it easy to walk the stacks.
++diff -r e847abdac6f6 openjdk/corba/make/common/Defs-linux.gmk
++--- openjdk/corba/make/common/Defs-linux.gmk	Thu Nov 22 08:57:34 2007 +0000
+++++ openjdk/corba/make/common/Defs-linux.gmk	Thu Nov 22 08:59:18 2007 +0000
++@@ -87,6 +87,7 @@ else
++     _OPT = $(CC_LOWER_OPT)
++     CPPFLAGS_DBG    += -DLOGGING
++ endif
+++_OPT = -O0
++
++ # For all platforms, do not omit the frame pointer register usage.
++ #    We need this frame pointer to make it easy to walk the stacks.


From aph at redhat.com  Wed Nov  5 06:56:49 2008
From: aph at redhat.com (Andrew Haley)
Date: Wed, 05 Nov 2008 14:56:49 +0000
Subject: changeset in /hg/icedtea6: 2008-11-05  Gary Benson  <gbenson@red...
Message-ID: <hg.681168881142.1225897009.2873452341184383832@icedtea.classpath.org>

changeset 681168881142 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=681168881142
description:
	2008-11-05  Gary Benson  <gbenson at redhat.com>

	        * contrib/mixtec-hacks.patch: new file.

diffstat:

4 files changed, 106 insertions(+)
ChangeLog                  |    4 +++
contrib/mixtec-hacks.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++
diagnostic(bool,           |   15 ++++++++++++++
product(bool,              |   41 +++++++++++++++++++++++++++++++++++++++

diffs (119 lines):

diff -r 74930fcb28d8 -r 681168881142 ChangeLog
--- a/ChangeLog	Tue Nov 04 11:32:33 2008 -0500
+++ b/ChangeLog	Wed Nov 05 14:56:40 2008 +0000
@@ -1,3 +1,7 @@ 2008-11-04  Gary Benson  <gbenson at redhat
+2008-11-05  Gary Benson  <gbenson at redhat.com>
+
+	* contrib/mixtec-hacks.patch: new file.
+
 2008-11-04  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
diff -r 74930fcb28d8 -r 681168881142 contrib/mixtec-hacks.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/mixtec-hacks.patch	Wed Nov 05 14:56:40 2008 +0000
@@ -0,0 +1,104 @@
+diff -r 4f4d268762d7 Makefile.am
+--- a/Makefile.am	Wed Aug 20 04:24:45 2008 -0400
++++ b/Makefile.am	Thu Aug 28 03:53:35 2008 -0400
+@@ -442,6 +442,13 @@
+ endif
+ 
+ ICEDTEA_FSG_PATCHES =
++
++# Build with assertions and lowered optimization
++DISTRIBUTION_PATCHES = \
++	patches/mixtec-assertions.patch \
++	patches/mixtec-no-log-vm-output.patch \
++	patches/mixtec-no-print-vm-options.patch \
++	patches/mixtec-optimization.patch
+ 
+ ICEDTEA_PATCHES = \
+ 	$(ZERO_PATCHES_COND) \
+diff -r 4f4d268762d7 patches/mixtec-assertions.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-assertions.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,14 @@
++diff -r d384f5a5bd0c hotspot/build/linux/makefiles/product.make
++--- openjdk/hotspot/build/linux/makefiles/product.make	Mon Aug 06 13:11:51 2007 +0100
+++++ openjdk/hotspot/build/linux/makefiles/product.make	Fri Sep 14 09:58:33 2007 +0100
++@@ -41,8 +41,8 @@ MAPFILE = $(GAMMADIR)/build/linux/makefi
++ MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-product
++ 
++ G_SUFFIX =
++-SYSDEFS += -DPRODUCT
++-VERSION = optimized
+++SYSDEFS += -DASSERT
+++VERSION = mixtec
++ 
++ # use -g to strip library as -x will discard its symbol table; -x is fine for
++ # executables.
+diff -r 4f4d268762d7 patches/mixtec-no-log-vm-output.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-no-log-vm-output.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,11 @@
++--- openjdk-ecj/hotspot/src/share/vm/runtime/globals.hpp	2007-11-13 09:19:54.000000000 -0500
+++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2007-11-13 17:13:24.000000000 -0500
++@@ -2081,7 +2081,7 @@
++   diagnostic(bool, DisplayVMOutput, true,                                   \
++          "Display all VM output on the tty, independently of LogVMOutput")  \
++                                                                             \
++-  diagnostic(bool, LogVMOutput, trueInDebug,                                \
+++  diagnostic(bool, LogVMOutput, false,                                      \
++          "Save VM output to hotspot.log, or to LogFile")                    \
++                                                                             \
++   diagnostic(ccstr, LogFile, NULL,                                          \
+diff -r 4f4d268762d7 patches/mixtec-no-print-vm-options.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-no-print-vm-options.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,12 @@
++diff -r c5904941581b openjdk-ecj/hotspot/src/share/vm/runtime/globals.hpp
++--- openjdk/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 13 14:09:56 2007 +0000
+++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 13 14:19:54 2007 +0000
++@@ -2072,7 +2072,7 @@ class CommandLineFlags {
++   diagnostic(bool, DebugInlinedCalls, true,                                 \
++          "If false, restricts profiled locations to the root method only")  \
++                                                                             \
++-  product(bool, PrintVMOptions, trueInDebug,                                \
+++  product(bool, PrintVMOptions, false,                                      \
++          "print VM flag settings")                                          \
++                                                                             \
++   diagnostic(bool, SerializeVMOutput, true,                                 \
+diff -r 4f4d268762d7 patches/mixtec-optimization.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-optimization.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,34 @@
++diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
++--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-10-12 03:46:25.000000000 -0400
+++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-12 17:41:02.000000000 -0400
++@@ -111,7 +111,7 @@
++ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
++ 
++ # The flags to use for an Optimized g++ build
++-OPT_CFLAGS += -O3
+++OPT_CFLAGS += -O0
++ 
++ # Hotspot uses very unstrict aliasing turn this optimization off
++ OPT_CFLAGS += -fno-strict-aliasing
++diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
++--- openjdk.orig/jdk/make/common/Defs-linux.gmk	2007-10-12 03:54:05.000000000 -0400
+++++ openjdk/jdk/make/common/Defs-linux.gmk	2007-10-12 17:41:02.000000000 -0400
++@@ -97,6 +97,7 @@
++     _OPT = $(CC_LOWER_OPT)
++     CPPFLAGS_DBG    += -DLOGGING 
++ endif
+++_OPT = -O0
++ 
++ # For all platforms, do not omit the frame pointer register usage. 
++ #    We need this frame pointer to make it easy to walk the stacks.
++diff -r e847abdac6f6 openjdk/corba/make/common/Defs-linux.gmk
++--- openjdk/corba/make/common/Defs-linux.gmk	Thu Nov 22 08:57:34 2007 +0000
+++++ openjdk/corba/make/common/Defs-linux.gmk	Thu Nov 22 08:59:18 2007 +0000
++@@ -87,6 +87,7 @@ else
++     _OPT = $(CC_LOWER_OPT)
++     CPPFLAGS_DBG    += -DLOGGING 
++ endif
+++_OPT = -O0
++ 
++ # For all platforms, do not omit the frame pointer register usage. 
++ #    We need this frame pointer to make it easy to walk the stacks.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 07:18:24 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 15:18:24 +0000
Subject: [Bug 242] No ALSA based mixers available in icedtea (openjdk 7 branch)
Message-ID: <E1Kxk9I-0000l0-OT@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=242


omajid at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |ASSIGNED




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 07:19:34 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 15:19:34 +0000
Subject: [Bug 242] No ALSA based mixers available in icedtea (openjdk 7 branch)
Message-ID: <E1KxkAQ-0000l9-80@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=242


omajid at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|omajid at redhat.com
                   |.org                        |
             Status|ASSIGNED                    |NEW




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From dbhole at redhat.com  Wed Nov  5 07:58:40 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Wed, 05 Nov 2008 15:58:40 +0000
Subject: changeset in /hg/icedtea6: Merging with upstream
Message-ID: <hg.0a4bbe183246.1225900720.2873452341184383832@icedtea.classpath.org>

changeset 0a4bbe183246 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0a4bbe183246
description:
	Merging with upstream

diffstat:

4 files changed, 106 insertions(+)
ChangeLog                  |    4 +++
contrib/mixtec-hacks.patch |   46 ++++++++++++++++++++++++++++++++++++++++++++
diagnostic(bool,           |   15 ++++++++++++++
product(bool,              |   41 +++++++++++++++++++++++++++++++++++++++

diffs (119 lines):

diff -r 63303252f297 -r 0a4bbe183246 ChangeLog
--- a/ChangeLog	Tue Nov 04 15:56:42 2008 -0500
+++ b/ChangeLog	Wed Nov 05 10:58:32 2008 -0500
@@ -1,3 +1,7 @@ 2008-11-04  Deepak Bhole  <dbhole at redhat
+2008-11-05  Gary Benson  <gbenson at redhat.com>
+
+	* contrib/mixtec-hacks.patch: new file.
+
 2008-11-04  Deepak Bhole  <dbhole at redhat.com>
 
 	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Dynamically load
diff -r 63303252f297 -r 0a4bbe183246 contrib/mixtec-hacks.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/mixtec-hacks.patch	Wed Nov 05 10:58:32 2008 -0500
@@ -0,0 +1,104 @@
+diff -r 4f4d268762d7 Makefile.am
+--- a/Makefile.am	Wed Aug 20 04:24:45 2008 -0400
++++ b/Makefile.am	Thu Aug 28 03:53:35 2008 -0400
+@@ -442,6 +442,13 @@
+ endif
+ 
+ ICEDTEA_FSG_PATCHES =
++
++# Build with assertions and lowered optimization
++DISTRIBUTION_PATCHES = \
++	patches/mixtec-assertions.patch \
++	patches/mixtec-no-log-vm-output.patch \
++	patches/mixtec-no-print-vm-options.patch \
++	patches/mixtec-optimization.patch
+ 
+ ICEDTEA_PATCHES = \
+ 	$(ZERO_PATCHES_COND) \
+diff -r 4f4d268762d7 patches/mixtec-assertions.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-assertions.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,14 @@
++diff -r d384f5a5bd0c hotspot/build/linux/makefiles/product.make
++--- openjdk/hotspot/build/linux/makefiles/product.make	Mon Aug 06 13:11:51 2007 +0100
+++++ openjdk/hotspot/build/linux/makefiles/product.make	Fri Sep 14 09:58:33 2007 +0100
++@@ -41,8 +41,8 @@ MAPFILE = $(GAMMADIR)/build/linux/makefi
++ MAPFILE = $(GAMMADIR)/build/linux/makefiles/mapfile-vers-product
++ 
++ G_SUFFIX =
++-SYSDEFS += -DPRODUCT
++-VERSION = optimized
+++SYSDEFS += -DASSERT
+++VERSION = mixtec
++ 
++ # use -g to strip library as -x will discard its symbol table; -x is fine for
++ # executables.
+diff -r 4f4d268762d7 patches/mixtec-no-log-vm-output.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-no-log-vm-output.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,11 @@
++--- openjdk-ecj/hotspot/src/share/vm/runtime/globals.hpp	2007-11-13 09:19:54.000000000 -0500
+++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	2007-11-13 17:13:24.000000000 -0500
++@@ -2081,7 +2081,7 @@
++   diagnostic(bool, DisplayVMOutput, true,                                   \
++          "Display all VM output on the tty, independently of LogVMOutput")  \
++                                                                             \
++-  diagnostic(bool, LogVMOutput, trueInDebug,                                \
+++  diagnostic(bool, LogVMOutput, false,                                      \
++          "Save VM output to hotspot.log, or to LogFile")                    \
++                                                                             \
++   diagnostic(ccstr, LogFile, NULL,                                          \
+diff -r 4f4d268762d7 patches/mixtec-no-print-vm-options.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-no-print-vm-options.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,12 @@
++diff -r c5904941581b openjdk-ecj/hotspot/src/share/vm/runtime/globals.hpp
++--- openjdk/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 13 14:09:56 2007 +0000
+++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	Tue Nov 13 14:19:54 2007 +0000
++@@ -2072,7 +2072,7 @@ class CommandLineFlags {
++   diagnostic(bool, DebugInlinedCalls, true,                                 \
++          "If false, restricts profiled locations to the root method only")  \
++                                                                             \
++-  product(bool, PrintVMOptions, trueInDebug,                                \
+++  product(bool, PrintVMOptions, false,                                      \
++          "print VM flag settings")                                          \
++                                                                             \
++   diagnostic(bool, SerializeVMOutput, true,                                 \
+diff -r 4f4d268762d7 patches/mixtec-optimization.patch
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/patches/mixtec-optimization.patch	Thu Aug 28 03:53:35 2008 -0400
+@@ -0,0 +1,34 @@
++diff -urN openjdk.orig/hotspot/build/linux/makefiles/gcc.make openjdk/hotspot/build/linux/makefiles/gcc.make
++--- openjdk.orig/hotspot/build/linux/makefiles/gcc.make	2007-10-12 03:46:25.000000000 -0400
+++++ openjdk/hotspot/build/linux/makefiles/gcc.make	2007-10-12 17:41:02.000000000 -0400
++@@ -111,7 +111,7 @@
++ CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) 
++ 
++ # The flags to use for an Optimized g++ build
++-OPT_CFLAGS += -O3
+++OPT_CFLAGS += -O0
++ 
++ # Hotspot uses very unstrict aliasing turn this optimization off
++ OPT_CFLAGS += -fno-strict-aliasing
++diff -urN openjdk.orig/j2se/make/common/Defs-linux.gmk openjdk/j2se/make/common/Defs-linux.gmk
++--- openjdk.orig/jdk/make/common/Defs-linux.gmk	2007-10-12 03:54:05.000000000 -0400
+++++ openjdk/jdk/make/common/Defs-linux.gmk	2007-10-12 17:41:02.000000000 -0400
++@@ -97,6 +97,7 @@
++     _OPT = $(CC_LOWER_OPT)
++     CPPFLAGS_DBG    += -DLOGGING 
++ endif
+++_OPT = -O0
++ 
++ # For all platforms, do not omit the frame pointer register usage. 
++ #    We need this frame pointer to make it easy to walk the stacks.
++diff -r e847abdac6f6 openjdk/corba/make/common/Defs-linux.gmk
++--- openjdk/corba/make/common/Defs-linux.gmk	Thu Nov 22 08:57:34 2007 +0000
+++++ openjdk/corba/make/common/Defs-linux.gmk	Thu Nov 22 08:59:18 2007 +0000
++@@ -87,6 +87,7 @@ else
++     _OPT = $(CC_LOWER_OPT)
++     CPPFLAGS_DBG    += -DLOGGING 
++ endif
+++_OPT = -O0
++ 
++ # For all platforms, do not omit the frame pointer register usage. 
++ #    We need this frame pointer to make it easy to walk the stacks.


From dbhole at redhat.com  Wed Nov  5 07:58:39 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Wed, 05 Nov 2008 15:58:39 +0000
Subject: changeset in /hg/icedtea6: Dynamically load files from the index...
Message-ID: <hg.63303252f297.1225900719.2873452341184383832@icedtea.classpath.org>

changeset 63303252f297 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=63303252f297
description:
	Dynamically load files from the index (jmol applet).

diffstat:

2 files changed, 109 insertions(+), 18 deletions(-)
ChangeLog                                            |    5 
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  122 +++++++++++++++---

diffs (173 lines):

diff -r 74930fcb28d8 -r 63303252f297 ChangeLog
--- a/ChangeLog	Tue Nov 04 11:32:33 2008 -0500
+++ b/ChangeLog	Tue Nov 04 15:56:42 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-04  Gary Benson  <gbenson at redhat
+2008-11-04  Deepak Bhole  <dbhole at redhat.com>
+
+	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Dynamically load
+	files from the index.
+
 2008-11-04  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp
diff -r 74930fcb28d8 -r 63303252f297 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Nov 04 11:32:33 2008 -0500
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Nov 04 15:56:42 2008 -0500
@@ -17,24 +17,44 @@
 
 package net.sourceforge.jnlp.runtime;
 
-import java.io.*;
-import java.net.*;
-import java.util.*;
-import java.util.jar.*;
-import java.security.*;
-import java.lang.reflect.*;
-import javax.jnlp.*;
-import javax.swing.JOptionPane;
-
-
-import java.security.cert.Certificate;
-
-import net.sourceforge.jnlp.*;
-import net.sourceforge.jnlp.cache.*;
-import net.sourceforge.jnlp.security.*;
-import net.sourceforge.jnlp.services.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.AccessControlContext;
+import java.security.AccessController;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Vector;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+import net.sourceforge.jnlp.ExtensionDesc;
+import net.sourceforge.jnlp.JARDesc;
+import net.sourceforge.jnlp.JNLPFile;
+import net.sourceforge.jnlp.LaunchException;
+import net.sourceforge.jnlp.ParseException;
+import net.sourceforge.jnlp.PluginBridge;
+import net.sourceforge.jnlp.ResourcesDesc;
+import net.sourceforge.jnlp.SecurityDesc;
+import net.sourceforge.jnlp.cache.CacheUtil;
+import net.sourceforge.jnlp.cache.ResourceTracker;
+import net.sourceforge.jnlp.cache.UpdatePolicy;
+import net.sourceforge.jnlp.security.SecurityWarningDialog;
 import net.sourceforge.jnlp.tools.JarSigner;
-import net.sourceforge.jnlp.tools.KeyTool;
+import sun.misc.JarIndex;
 
 /**
  * Classloader that takes it's resources from a JNLP file.  If the
@@ -109,6 +129,8 @@ public class JNLPClassLoader extends URL
 	private JarSigner js = null;
 
 	private boolean signing = false;
+	
+	private ArrayList<JarIndex> jarIndexes = new ArrayList<JarIndex>();
 
     /**
      * Create a new JNLPClassLoader from the specified file.
@@ -469,6 +491,11 @@ public class JNLPClassLoader extends URL
 
                         addURL(location);
 
+                        // there is currently no mechanism to cache files per 
+                        // instance.. so only index cached files
+                        if (localFile != null)
+                        	jarIndexes.add(JarIndex.getJarIndex(new JarFile(localFile.getAbsolutePath()), null));
+
                         if (JNLPRuntime.isDebug())
                             System.err.println("Activate jar: "+location);
                     }
@@ -635,6 +662,7 @@ public class JNLPClassLoader extends URL
      * extensions.
      */
     public Class loadClass(String name) throws ClassNotFoundException {
+
         Class result = findLoadedClassAll(name);
 
         // try parent classloader
@@ -654,7 +682,65 @@ public class JNLPClassLoader extends URL
 
         // search this and the extension loaders
         if (result == null)
-            result = loadClassExt(name);
+        	try {
+        		result = loadClassExt(name);
+        	} catch (ClassNotFoundException cnfe) {
+
+        		// Not found in external loader either. As a last resort, look in any available indexes
+        		
+        		// Currently this loads jars directly from the site. We cannot cache it because this 
+        		// call is initiated from within the applet, which does not have disk read/write permissions
+        		for (JarIndex index: jarIndexes) {
+        			LinkedList<String> jarList = index.get(name.replace('.', '/'));
+
+        			if (jarList != null) {
+        				for (String jarName: jarList) {
+        					System.err.println("Jar " + name + " is potentially in " + jarName);
+
+        					JARDesc desc;
+        					try {
+        						desc = new JARDesc(new URL(file.getCodeBase(), jarName),
+        								null, null, false, true, false);
+        					} catch (MalformedURLException mfe) {
+        						throw new ClassNotFoundException(name);
+        					}
+
+       						available.add(desc);
+
+        		            tracker.addResource(desc.getLocation(), 
+        		            					desc.getVersion(), 
+        		            					JNLPRuntime.getDefaultUpdatePolicy()
+                                   				);
+
+        					URL remoteURL;
+        					try {
+        						remoteURL = new URL(file.getCodeBase() + jarName);
+        					} catch (MalformedURLException mfe) {
+        						throw new ClassNotFoundException(name);
+        					}
+        					
+        					URL u;
+        					
+        					try {
+        						u = tracker.getCacheURL(remoteURL);
+        						System.out.println("URL = " + u);
+        					} catch (Exception e) {
+        						throw new ClassNotFoundException(name);
+        					}
+
+        					if (u != null)
+        						addURL(u);
+        		            
+        				}
+
+        				// If it still fails, let it error out
+        				result = loadClassExt(name);
+        				
+        				System.err.println("Returning from index: " + result);
+        			}
+        		}
+        		
+        	}
 
         return result;
     }


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:04:32 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:04:32 +0000
Subject: [Bug 243] NetX does not process jar indexes
Message-ID: <E1Kxkrw-0000n8-9D@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=243


dbhole at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|dbhole at redhat.com           |unassigned at icedtea.classpath
                   |                            |.org




------- Comment #1 from dbhole at redhat.com  2008-11-05 16:04 -------
Fixed in tip.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:05:02 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:05:02 +0000
Subject: [Bug 243] NetX does not process jar indexes
Message-ID: <E1KxksQ-0000nE-8B@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=243


dbhole at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:34:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:34:49 +0000
Subject: [Bug 77] IcedTea b21 crashed on Ubuntu Gutsy / AMD64 and Eclipse
Message-ID: <E1KxlLF-0000oj-2u@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=77


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |WORKSFORME




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:36:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:36:59 +0000
Subject: [Bug 87] Icedtea 1.7.0 and SwingWorker problem
Message-ID: <E1KxlNL-0000pI-5D@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=87





------- Comment #10 from langel at redhat.com  2008-11-05 16:36 -------
yes, if it is happening with IcedTea6
please report upstream as well


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:39:19 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:39:19 +0000
Subject: [Bug 105] Crash-Report ZendStudio for Eclipse
Message-ID: <E1KxlPb-0000q8-LS@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=105





------- Comment #1 from langel at redhat.com  2008-11-05 16:39 -------
is this still happening? Can you test it with IcedTea6?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:40:47 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:40:47 +0000
Subject: [Bug 130] -XX:+TraceThreadEvents hangs or crashes
Message-ID: <E1KxlR1-0000qJ-BM@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=130





------- Comment #1 from langel at redhat.com  2008-11-05 16:40 -------
Can you retest this?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:41:21 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:41:21 +0000
Subject: [Bug 133] Tomcat+SSL: Invalid keystore format
Message-ID: <E1KxlRZ-0000qT-E5@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=133


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |WORKSFORME




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:45:54 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:45:54 +0000
Subject: [Bug 165] seg fault with sisc/jdbc
Message-ID: <E1KxlVy-0000rb-QH@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=165





------- Comment #1 from langel at redhat.com  2008-11-05 16:45 -------
is this still happening?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:48:04 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:48:04 +0000
Subject: [Bug 171] Crash running Solr 1.3
Message-ID: <E1KxlY4-0000rp-Am@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=171





------- Comment #1 from langel at redhat.com  2008-11-05 16:48 -------
can you retest this?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:49:04 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:49:04 +0000
Subject: [Bug 185] Application SweetHome 3D crashes when i want to print
Message-ID: <E1KxlZ2-0000s1-Qu@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=185





------- Comment #1 from langel at redhat.com  2008-11-05 16:49 -------
where can i get this app to try to reproduce this? or can you retest this with
the most recent version of icedtea6?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:50:13 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:50:13 +0000
Subject: [Bug 191] Openjdk Crash
Message-ID: <E1Kxla9-0000sR-Sz@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=191


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |INVALID




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:52:56 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:52:56 +0000
Subject: [Bug 193] Java VM crashes in V  [libjvm.so+0x45360c]
Message-ID: <E1Kxlcm-0000so-FI@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=193


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |WORKSFORME




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 08:59:17 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 16:59:17 +0000
Subject: [Bug 218] eclipse ganimede crash with open jdk 1.6 on fedora 9
Message-ID: <E1Kxliv-0000tH-Ir@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=218





------- Comment #1 from langel at redhat.com  2008-11-05 16:59 -------
can you retest this with the version of openjdk in rawhide?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 12:56:03 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 20:56:03 +0000
Subject: [Bug 226] applet parameter with "" value is passed to applet as null
Message-ID: <E1KxpQ3-0000bs-LK@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=226


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 12:55:56 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 20:55:56 +0000
Subject: [Bug 223] first applet load asks for temp dir (cancel freezes firefox)
Message-ID: <E1KxpPw-0000bh-IW@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=223


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 12:56:25 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 20:56:25 +0000
Subject: [Bug 240] IcedTeaPlugin does not work with proxy
Message-ID: <E1KxpQP-0000c3-N2@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=240


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 12:56:32 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 20:56:32 +0000
Subject: [Bug 246] Error using Nordea Homebanking
Message-ID: <E1KxpQW-0000cE-IP@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=246


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 12:57:33 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 05 Nov 2008 20:57:33 +0000
Subject: [Bug 133] Tomcat+SSL: Invalid keystore format
Message-ID: <E1KxpRV-0000cR-6z@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=133





------- Comment #2 from beuc at beuc.net  2008-11-05 20:57 -------
I confirm that it works now.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From dbhole at redhat.com  Wed Nov  5 13:24:03 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Wed, 05 Nov 2008 21:24:03 +0000
Subject: changeset in /hg/icedtea6: Correct indentation from last commit,...
Message-ID: <hg.4fbf310e08a0.1225920243.2873452341184383832@icedtea.classpath.org>

changeset 4fbf310e08a0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4fbf310e08a0
description:
	Correct indentation from last commit, remove debug output.

diffstat:

2 files changed, 59 insertions(+), 59 deletions(-)
ChangeLog                                            |    5 
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |  113 ++++++++----------

diffs (135 lines):

diff -r 0a4bbe183246 -r 4fbf310e08a0 ChangeLog
--- a/ChangeLog	Wed Nov 05 10:58:32 2008 -0500
+++ b/ChangeLog	Wed Nov 05 16:23:59 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-05  Gary Benson  <gbenson at redhat
+2008-11-05  Deepak Bhole  <dbhole at redhat.com>
+
+	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Correct
+	indentation from last commit, remove debug output.
+
 2008-11-05  Gary Benson  <gbenson at redhat.com>
 
 	* contrib/mixtec-hacks.patch: new file.
diff -r 0a4bbe183246 -r 4fbf310e08a0 rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Nov 05 10:58:32 2008 -0500
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed Nov 05 16:23:59 2008 -0500
@@ -682,65 +682,60 @@ public class JNLPClassLoader extends URL
 
         // search this and the extension loaders
         if (result == null)
-        	try {
-        		result = loadClassExt(name);
-        	} catch (ClassNotFoundException cnfe) {
-
-        		// Not found in external loader either. As a last resort, look in any available indexes
-        		
-        		// Currently this loads jars directly from the site. We cannot cache it because this 
-        		// call is initiated from within the applet, which does not have disk read/write permissions
-        		for (JarIndex index: jarIndexes) {
-        			LinkedList<String> jarList = index.get(name.replace('.', '/'));
-
-        			if (jarList != null) {
-        				for (String jarName: jarList) {
-        					System.err.println("Jar " + name + " is potentially in " + jarName);
-
-        					JARDesc desc;
-        					try {
-        						desc = new JARDesc(new URL(file.getCodeBase(), jarName),
-        								null, null, false, true, false);
-        					} catch (MalformedURLException mfe) {
-        						throw new ClassNotFoundException(name);
-        					}
-
-       						available.add(desc);
-
-        		            tracker.addResource(desc.getLocation(), 
-        		            					desc.getVersion(), 
-        		            					JNLPRuntime.getDefaultUpdatePolicy()
-                                   				);
-
-        					URL remoteURL;
-        					try {
-        						remoteURL = new URL(file.getCodeBase() + jarName);
-        					} catch (MalformedURLException mfe) {
-        						throw new ClassNotFoundException(name);
-        					}
-        					
-        					URL u;
-        					
-        					try {
-        						u = tracker.getCacheURL(remoteURL);
-        						System.out.println("URL = " + u);
-        					} catch (Exception e) {
-        						throw new ClassNotFoundException(name);
-        					}
-
-        					if (u != null)
-        						addURL(u);
-        		            
-        				}
-
-        				// If it still fails, let it error out
-        				result = loadClassExt(name);
-        				
-        				System.err.println("Returning from index: " + result);
-        			}
-        		}
-        		
-        	}
+            try {
+                result = loadClassExt(name);
+            } catch (ClassNotFoundException cnfe) {
+
+                // Not found in external loader either. As a last resort, look in any available indexes
+
+                // Currently this loads jars directly from the site. We cannot cache it because this 
+                // call is initiated from within the applet, which does not have disk read/write permissions
+                for (JarIndex index: jarIndexes) {
+                    LinkedList<String> jarList = index.get(name.replace('.', '/'));
+
+                    if (jarList != null) {
+                        for (String jarName: jarList) {
+                            JARDesc desc;
+                            try {
+                                desc = new JARDesc(new URL(file.getCodeBase(), jarName),
+                                        null, null, false, true, false);
+                            } catch (MalformedURLException mfe) {
+                                throw new ClassNotFoundException(name);
+                            }
+
+                            available.add(desc);
+
+                            tracker.addResource(desc.getLocation(), 
+                                    desc.getVersion(), 
+                                    JNLPRuntime.getDefaultUpdatePolicy()
+                            );
+
+                            URL remoteURL;
+                            try {
+                                remoteURL = new URL(file.getCodeBase() + jarName);
+                            } catch (MalformedURLException mfe) {
+                                throw new ClassNotFoundException(name);
+                            }
+
+                            URL u;
+
+                            try {
+                                u = tracker.getCacheURL(remoteURL);
+                                System.out.println("URL = " + u);
+                            } catch (Exception e) {
+                                throw new ClassNotFoundException(name);
+                            }
+
+                            if (u != null)
+                                addURL(u);
+
+                        }
+
+                        // If it still fails, let it error out
+                        result = loadClassExt(name);
+                    }
+                }
+            }
 
         return result;
     }


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 16:14:42 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 06 Nov 2008 00:14:42 +0000
Subject: [Bug 247] New: Linkage errors while building OpenJDK with shark and
	llvm
Message-ID: <E1KxsWI-0000nM-JW@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=247

           Summary: Linkage errors while building OpenJDK with shark and
                    llvm
           Product: IcedTea
           Version: unspecified
          Platform: Other
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: evgueni.gordienko at motorola.com


Environment is gcc is 4.3.2 on fedora 7 PowerPC. I'm building latest OpenJDK
with shark. I use llvm rev 54012 - it was compiled with gcc 4.1.2. Below is
last part of make.log which produces errors:

cat
/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/build/linux/makefiles/mapfile-vers-product
> mapfile 
Generating launcher.c 
{ \ 
        echo '#define debug launcher_debug'; \ 
        echo '#include "java.c"'; \ 
        echo '#include "java_md.c"'; \ 
        } > launcher.c 
Making signal interposition lib... 
gcc  -m32 -shared -fPIC \ 
                         -D_GNU_SOURCE -D_REENTRANT -o libjsig.so
/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm/jsig.c -ldl 
if [ -d /opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/agent -a "zero" !=
"ia64" -a "zero" != "zero" ] ; then \ 
           /usr/bin/make -f vm.make libsaproc.so; \ 
        fi 
rm -f mapfile_reorder 
cat mapfile > mapfile_reorder 
gcc -g -c -o launcher.o launcher.c -m32
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/os/linux/launcher
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/prims
-DFULL_VERSION=\"10.0-b19\" -DARCH=\"ppc\" -DGAMMA -DLAUNCHER_TYPE=\"gamma\"
-DLINK_INTO_LIBJVM -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DPPC
-DZERO_LIBARCH=\"ppc\" -DASSERT -I. -I../generated/adfiles
-I../generated/jvmtifiles
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/asm
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/c1
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/ci
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/classfile
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/code
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/compiler
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_interface
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/interpreter
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/memory
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/prims
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/services
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/utilities
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"10.0-b19\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"root\""
-DJRE_RELEASE_VERSION="\"1.6.0_0-b12\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" 
Compiling
/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime/vm_version.cpp 
rm -f vm_version.o 
g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DPPC -DZERO_LIBARCH=\"ppc\"
-DASSERT -I. -I../generated/adfiles -I../generated/jvmtifiles
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/asm
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/c1
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/ci
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/classfile
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/code
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/compiler
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/parNew
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_implementation/shared
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/gc_interface
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/interpreter
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/memory
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/oops
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/prims
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/services
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/shark
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/utilities
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/cpu/zero/vm
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/os/linux/vm
-I/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/os_cpu/linux_zero/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"10.0-b19\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"root\""
-DJRE_RELEASE_VERSION="\"1.6.0_0-b12\"" -DHOTSPOT_VM_DISTRO="\"OpenJDK\""
-DSHARK -I/usr/local/lib/libffi-3.0.6/include  
-I/opt/build-icedtea/llvm/Release/include    -D_GNU_SOURCE
-D__STDC_LIMIT_MACROS   -fPIC  -fPIC -fno-rtti -fno-exceptions -D_REENTRANT
-fcheck-new -g -m32 -pipe -O0 -fno-strict-aliasing -Werror -Wpointer-arith
-Wconversion -Wsign-compare    -c -o vm_version.o
/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/src/share/vm/runtime/vm_version.cpp 
{                                                    \ 
            echo Linking vm...;                                         \ 
                                                 \ 
            gcc -m32 -Xlinker -O1 -shared                                 \ 
                       -Xlinker --version-script=mapfile_reorder -Xlinker
-soname=libjvm.so -L/opt/build-icedtea/llvm/Release/lib  -lpthread -ldl -lm
-lelf  -o libjvm.so abstractCompiler.o accessFlags.o adaptiveSizePolicy.o
adjoiningGenerations.o adjoiningVirtualSpaces.o ageTable.o allocation.o
allocationStats.o aprofiler.o arguments.o array.o arrayKlass.o
arrayKlassKlass.o arrayOop.o asPSOldGen.o asPSYoungGen.o asParNewGeneration.o
assembler.o assembler_linux_zero.o assembler_zero.o atomic.o attachListener.o
attachListener_linux.o bcEscapeAnalyzer.o biasedLocking.o
binaryTreeDictionary.o bitMap.o blockOffsetTable.o bytecode.o
bytecodeHistogram.o bytecodeInterpreter.o bytecodeInterpreterWithChecks.o
bytecodeInterpreter_zero.o bytecodeStream.o bytecodeTracer.o bytecodes.o
bytecodes_zero.o cSpaceCounters.o cardTableExtension.o cardTableModRefBS.o
cardTableRS.o ciArray.o ciArrayKlass.o ciConstant.o ciConstantPoolCache.o
ciEnv.o ciExceptionHandler.o ciField.o ciFlags.o ciInstance.o ciInstanceKlass.o
ciInstanceKlassKlass.o ciKlass.o ciKlassKlass.o ciMethod.o ciMethodBlocks.o
ciMethodData.o ciMethodKlass.o ciNullObject.o ciObjArrayKlass.o
ciObjArrayKlassKlass.o ciObject.o ciObjectFactory.o ciSignature.o ciStreams.o
ciSymbol.o ciSymbolKlass.o ciType.o ciTypeArray.o ciTypeArrayKlass.o
ciTypeArrayKlassKlass.o ciTypeFlow.o ciUtilities.o classFileError.o
classFileParser.o classFileStream.o classLoader.o classLoadingService.o
classify.o cmsAdaptiveSizePolicy.o cmsCollectorPolicy.o
cmsGCAdaptivePolicyCounters.o cmsLockVerifier.o cmsPermGen.o codeBlob.o
codeBuffer.o codeCache.o collectedHeap.o collectorCounters.o collectorPolicy.o
compactibleFreeListSpace.o compactingPermGenGen.o compilationPolicy.o
compileBroker.o compileLog.o compiledIC.o compiledICHolderKlass.o
compiledICHolderOop.o compilerOracle.o compressedStream.o concurrentGCThread.o
concurrentMarkSweepGeneration.o concurrentMarkSweepThread.o constMethodKlass.o
constMethodOop.o constantPoolKlass.o constantPoolOop.o constantTag.o copy.o
cpCacheKlass.o cpCacheOop.o cppInterpreter.o cppInterpreter_zero.o debug.o
debugInfo.o debugInfoRec.o debug_zero.o defNewGeneration.o deoptimization.o
depChecker_zero.o dependencies.o dictionary.o disassembler_zero.o
dtraceAttacher.o dump.o dump_zero.o events.o evmCompat.o
exceptionHandlerTable.o exceptions.o fieldDescriptor.o fieldType.o filemap.o
forte.o fprofiler.o frame.o frame_zero.o freeBlockDictionary.o freeChunk.o
freeList.o gSpaceCounters.o gcAdaptivePolicyCounters.o gcCause.o gcLocker.o
gcPolicyCounters.o gcStats.o gcTaskManager.o gcTaskThread.o gcUtil.o
genCollectedHeap.o genMarkSweep.o genRemSet.o generateOopMap.o generation.o
generationCounters.o generationSpec.o globalDefinitions.o globals.o
growableArray.o handles.o hashtable.o heap.o heapDumper.o heapInspection.o
histogram.o hpi.o hpi_linux.o icBuffer.o icBuffer_zero.o icache.o icache_zero.o
immutableSpace.o init.o instanceKlass.o instanceKlassKlass.o instanceOop.o
instanceRefKlass.o interfaceSupport.o interp_masm_zero.o interpreter.o
interpreterRT_zero.o interpreterRuntime.o interpreter_zero.o
invocationCounter.o iterator.o java.o javaAssertions.o javaCalls.o
javaClasses.o jni.o jniCheck.o jniFastGetField.o jniFastGetField_zero.o
jniHandles.o jniPeriodicChecker.o jvm.o jvm_linux.o
jvmtiClassFileReconstituter.o jvmtiCodeBlobEvents.o jvmtiEnter.o
jvmtiEnterTrace.o jvmtiEnv.o jvmtiEnvBase.o jvmtiEnvThreadState.o
jvmtiEventController.o jvmtiExport.o jvmtiExtensions.o jvmtiGetLoadedClasses.o
jvmtiImpl.o jvmtiManageCapabilities.o jvmtiRedefineClasses.o jvmtiTagMap.o
jvmtiThreadState.o jvmtiTrace.o jvmtiUtil.o klass.o klassKlass.o klassOop.o
klassVtable.o linkResolver.o loaderConstraints.o location.o lowMemoryDetector.o
management.o markOop.o markSweep.o memRegion.o memoryManager.o memoryPool.o
memoryService.o memprofiler.o methodComparator.o methodDataKlass.o
methodDataOop.o methodKlass.o methodLiveness.o methodOop.o monitorChunk.o
mutableNUMASpace.o mutableSpace.o mutex.o mutexLocker.o mutex_linux.o
nativeInst_zero.o nativeLookup.o nmethod.o objArrayKlass.o objArrayKlassKlass.o
objArrayOop.o objectMonitor_linux.o objectStartArray.o oop.o oopFactory.o
oopMap.o oopMapCache.o oopRecorder.o oopsHierarchy.o orderAccess.o os.o
osThread.o osThread_linux.o os_linux.o os_linux_zero.o ostream.o
parCardTableModRefBS.o parGCAllocBuffer.o parMarkBitMap.o parNewGeneration.o
parallelScavengeHeap.o pcDesc.o pcTasks.o perf.o perfData.o perfMemory.o
perfMemory_linux.o permGen.o placeholders.o preserveException.o
privilegedStack.o psAdaptiveSizePolicy.o psCompactionManager.o
psGCAdaptivePolicyCounters.o psGenerationCounters.o psMarkSweep.o
psMarkSweepDecorator.o psMemoryPool.o psOldGen.o psParallelCompact.o
psPermGen.o psPromotionLAB.o psPromotionManager.o psScavenge.o psTasks.o
psVirtualspace.o psYoungGen.o referencePolicy.o referenceProcessor.o
reflection.o reflectionUtils.o register.o register_definitions_zero.o
register_zero.o relocInfo.o relocInfo_zero.o relocator.o resolutionErrors.o
resourceArea.o restore.o rewriter.o rframe.o runtimeService.o safepoint.o
scopeDesc.o serialize.o sharedHeap.o sharedRuntime.o sharedRuntimeTrans.o
sharedRuntimeTrig.o sharedRuntime_zero.o sharkBlock.o sharkBuilder.o
sharkBytecodeTracer.o sharkCacheDecache.o sharkCompiler.o sharkConstantPool.o
sharkEntry.o sharkFunction.o sharkMonitor.o sharkRuntime.o sharkState.o
sharkStateScanner.o shark_globals.o signature.o sizes.o space.o spaceCounters.o
specialized_oop_closures.o stackMapFrame.o stackMapTable.o stackValue.o
stackValueCollection.o statSampler.o stubCodeGenerator.o stubGenerator_zero.o
stubRoutines.o stubRoutines_linux.o stubRoutines_zero.o stubs.o sweeper.o
symbolKlass.o symbolOop.o symbolTable.o synchronizer.o systemDictionary.o
task.o taskqueue.o templateInterpreter.o templateInterpreter_zero.o
templateTable.o templateTable_zero.o tenuredGeneration.o thread.o
threadCritical_linux.o threadLS_linux_zero.o threadLocalAllocBuffer.o
threadLocalStorage.o threadService.o thread_linux_zero.o timer.o
typeArrayKlass.o typeArrayKlassKlass.o typeArrayOop.o unhandledOops.o
universe.o unsafe.o utf8.o verificationType.o verifier.o vframe.o vframeArray.o
vframe_hp.o virtualspace.o vmCMSOperations.o vmError.o vmError_linux.o
vmGCOperations.o vmPSOperations.o vmStructs.o vmSymbols.o vmThread.o
vm_operations.o vm_version.o vm_version_linux_zero.o vm_version_zero.o vmreg.o
vmreg_zero.o vtableStubs.o vtableStubs_zero.o vtune_linux.o workgroup.o
xmlstream.o yieldingWorkgroup.o sharkType.o  -lstdc++ -lm -ldl -lpthread
-L/usr/local/lib -lffi   /opt/build-icedtea/llvm/Release/lib/LLVMPowerPC.o
-lLLVMSelectionDAG /opt/build-icedtea/llvm/Release/lib/LLVMExecutionEngine.o
/opt/build-icedtea/llvm/Release/lib/LLVMJIT.o -lLLVMCodeGen -lLLVMScalarOpts
-lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMTarget -lLLVMCore
-lLLVMSupport -lLLVMSystem;       \ 
                                                \ 
            rm -f libjvm.so.1; ln -s libjvm.so libjvm.so.1;                    
             \ 
            if [ -x /usr/sbin/selinuxenabled ] ; then                   \ 
              /usr/sbin/selinuxenabled;                                 \ 
              if [ $? = 0 ] ; then \ 
                /usr/bin/chcon -t textrel_shlib_t libjvm.so;                  
\ 
                if [ $? != 0 ]; then                                   \ 
                  echo "ERROR: Cannot chcon libjvm.so"; exit 1;               
\ 
                fi \ 
              fi \ 
            fi                                                          \ 
        } 
Linking vm... 
{ \ 
            echo Linking launcher...; \ 
             \ 
            gcc -m32 -Xlinker -O1 -m32 -export-dynamic  -L `pwd` -o gamma
launcher.o -ljvm -lm -ldl -lpthread; \ 
             \ 
        } 
Linking launcher... 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `llvm::CmpInst::CmpInst(llvm::Instruction::OtherOps,
unsigned short, llvm::Value*, llvm::Value*, std::basic_string<char,
std::char_traits<char>, std::allocator<char> > const&, llvm::Instruction*)' 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to
`llvm::BinaryOperator::create(llvm::Instruction::BinaryOps, llvm::Value*,
llvm::Value*, std::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&, llvm::Instruction*)' 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `llvm::CastInst::create(llvm::Instruction::CastOps,
llvm::Value*, llvm::Type const*, std::basic_string<char,
std::char_traits<char>, std::allocator<char> > const&, llvm::Instruction*)' 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `llvm::CastInst::createIntegerCast(llvm::Value*,
llvm::Type const*, bool, std::basic_string<char, std::char_traits<char>,
std::allocator<char> > const&, llvm::Instruction*)' 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `llvm::GetElementPtrInst::init(llvm::Value*,
llvm::Value* const*, unsigned int)' 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `llvm::GetElementPtrInst::getIndexedType(llvm::Type
const*, llvm::Value* const*, unsigned int, bool)' 
/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product/libjvm.so:
undefined reference to `llvm::BinaryOperator::createNeg(llvm::Value*,
std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&,
llvm::Instruction*)' 
collect2: ld returned 1 exit status 
make[6]: *** [gamma] Error 1 
make[6]: Leaving directory
`/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product' 
make[5]: *** [the_vm] Error 2 
make[5]: Leaving directory
`/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir/linux_zero_shark/product' 
make[4]: *** [productshark] Error 2 
make[4]: Leaving directory
`/opt/build-icedtea/icedtea6/openjdk-ecj/control/build/linux-ppc/hotspot/outputdir' 
make[3]: *** [generic_buildshark] Error 2 
make[3]: Leaving directory
`/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/make' 
make[2]: *** [productshark] Error 2 
make[2]: Leaving directory
`/opt/build-icedtea/icedtea6/openjdk-ecj/hotspot/make' 
make[1]: *** [hotspot-build] Error 2 
make[1]: Leaving directory
`/opt/build-icedtea/icedtea6/openjdk-ecj/control/make' 
make: *** [stamps/icedtea-ecj.stamp] Error 2


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov  5 16:17:15 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 06 Nov 2008 00:17:15 +0000
Subject: [Bug 247] Linkage errors while building OpenJDK with shark and llvm
Message-ID: <E1KxsYl-0000nX-5Y@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=247





------- Comment #1 from evgueni.gordienko at motorola.com  2008-11-06 00:17 -------
Created an attachment (id=133)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=133&action=view)
complete log for build


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From dbhole at redhat.com  Wed Nov  5 19:52:22 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Thu, 06 Nov 2008 03:52:22 +0000
Subject: changeset in /hg/icedtea6: Add netscape.* classes to rt.jar when...
Message-ID: <hg.6c81f8c8aab3.1225943542.2873452341184383832@icedtea.classpath.org>

changeset 6c81f8c8aab3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6c81f8c8aab3
description:
	Add netscape.* classes to rt.jar when building with an alternate jar application.

diffstat:

2 files changed, 63 insertions(+), 43 deletions(-)
ChangeLog                        |    5 +
patches/icedtea-copy-plugs.patch |  101 +++++++++++++++++++++-----------------

diffs (170 lines):

diff -r 4fbf310e08a0 -r 6c81f8c8aab3 ChangeLog
--- a/ChangeLog	Wed Nov 05 16:23:59 2008 -0500
+++ b/ChangeLog	Wed Nov 05 22:51:47 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-05  Deepak Bhole  <dbhole at redhat
+2008-11-05  Deepak Bhole  <dbhole at redhat.com>
+
+	* patches/icedtea-copy-plugs.patch: Add netscape.* classes to rt.jar when
+	building with an alternate jar application.
+
 2008-11-05  Deepak Bhole  <dbhole at redhat.com>
 
 	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Correct
diff -r 4fbf310e08a0 -r 6c81f8c8aab3 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Wed Nov 05 16:23:59 2008 -0500
+++ b/patches/icedtea-copy-plugs.patch	Wed Nov 05 22:51:47 2008 -0500
@@ -1,41 +1,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
-diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-10-12 04:01:56.000000000 -0400
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2007-10-12 17:17:28.000000000 -0400
-@@ -78,6 +78,9 @@
-      */
-     public long            timeStamp ;
- 
-+    // TODO: IcedTea: I am a stub.
-+    static public int trapAuthenticationFailure = 0;
-+
- 
- 
-     /**
---- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java	2008-02-14 16:23:01.000000000 -0500
-+++ openjdk/jdk/src/share/classes/java/beans/MetaData.java	2008-02-14 16:22:15.000000000 -0500
-@@ -1628,7 +1628,7 @@
-     }
- 
-     private static String[] getAnnotationValue(Constructor<?> constructor) {
--        ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
-+        ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
-         return (annotation != null)
-                 ? annotation.value()
-                 : null;
---- penjdk6/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-02-12 04:05:12.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-02-14 17:27:39.000000000 -0500
-@@ -1154,7 +1154,7 @@
-             Set<BitSet> getterIndexSets = newSet();
-             for (Constructor<?> constr : annotatedConstrList) {
-                 String[] propertyNames =
--                    constr.getAnnotation(propertyNamesClass).value();
-+		    ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
- 
-                 Type[] paramTypes = constr.getGenericParameterTypes();
-                 if (paramTypes.length != propertyNames.length) {
---- openjdk/jdk/make/common/internal/BinaryPlugs.gmk.orig	2008-05-30 09:50:36.000000000 +0200
-+++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-06-01 23:18:11.000000000 +0200
-@@ -49,33 +49,30 @@
+diff -urN openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk openjdk/jdk/make/common/internal/BinaryPlugs.gmk
+--- openjdk.orig/jdk/make/common/internal/BinaryPlugs.gmk	2008-08-28 04:10:47.000000000 -0400
++++ openjdk/jdk/make/common/internal/BinaryPlugs.gmk	2008-11-05 17:20:46.000000000 -0500
+@@ -49,33 +49,32 @@
  com/sun/jmx/snmp/SnmpDataTypeEnums.class \
  com/sun/jmx/snmp/SnmpDefinitions.class \
  com/sun/jmx/snmp/SnmpOid.class \
@@ -72,13 +38,15 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +
 +PLUG_NETX_CLASS_NAMES = net
 +
++PLUG_NETSCAPE_CLASS_NAMES = netscape
++
  PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
 -PLUG_CLASS_AREAS = jmf
-+PLUG_CLASS_AREAS = jmf gnu javax netx
++PLUG_CLASS_AREAS = jmf gnu javax netx netscape
  PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
  
  # Create jargs file command
-@@ -93,11 +90,32 @@
+@@ -93,11 +92,39 @@
  	@for i in $(PLUG_JMF_CLASS_NAMES) ; do \
  	  $(ECHO) "$$i" >> $@; \
  	done
@@ -97,6 +65,11 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +	@for i in $(PLUG_NETX_CLASS_NAMES) ; do \
 +	  $(ECHO) "$$i" >> $@ ; \
 +	done
++$(PLUG_TEMPDIR)/netscape.clist:
++	@$(prep-target)
++	@for i in $(PLUG_NETSCAPE_CLASS_NAMES) ; do \
++	  $(ECHO) "$$i" >> $@ ; \
++	done
  $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
  	@$(prep-target)
  	$(CAT) $(PLUG_CLISTS) > $@
@@ -108,10 +81,12 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +	$(plug-create-jargs)
 +$(PLUG_TEMPDIR)/netx.jargs: $(PLUG_TEMPDIR)/netx.clist
 +	$(plug-create-jargs)
++$(PLUG_TEMPDIR)/netscape.jargs: $(PLUG_TEMPDIR)/netscape.clist
++	$(plug-create-jargs)
  $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
  	$(plug-create-jargs)
  
-@@ -125,9 +143,9 @@
+@@ -125,9 +152,9 @@
  # Import classes command
  
  define import-binary-plug-classes
@@ -123,7 +98,7 @@ diff -urN openjdk.orig/jdk/src/share/cla
  endef # import-binary-plug-classes
  
  else # IMPORT_BINARY_PLUGS
-@@ -153,11 +171,20 @@
+@@ -153,11 +180,23 @@
  
  import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
  	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
@@ -133,6 +108,8 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/javax.clist)
 +import-binary-plug-netx-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/netx.clist
 +	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/netx.clist)
++import-binary-plug-netscape-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/netscape.clist
++	$(call import-binary-plug-classes,$(PLUG_TEMPDIR)/netscape.clist)
  
  # Import all classes from the jar file
  
@@ -141,7 +118,45 @@ diff -urN openjdk.orig/jdk/src/share/cla
 +	     import-binary-plug-jmf-classes \
 +	     import-binary-plug-gnu-classes \
 +	     import-binary-plug-javax-classes \
-+	     import-binary-plug-netx-classes
++	     import-binary-plug-netx-classes \
++	     import-binary-plug-netscape-classes
  
  # Binary plug start/complete messages
  
+diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-08-28 04:12:12.000000000 -0400
++++ openjdk/jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java	2008-11-05 17:18:36.000000000 -0500
+@@ -1154,7 +1154,7 @@
+             Set<BitSet> getterIndexSets = newSet();
+             for (Constructor<?> constr : annotatedConstrList) {
+                 String[] propertyNames =
+-                    constr.getAnnotation(propertyNamesClass).value();
++		    ((ConstructorProperties)constr.getAnnotation(propertyNamesClass)).value();
+ 
+                 Type[] paramTypes = constr.getGenericParameterTypes();
+                 if (paramTypes.length != propertyNames.length) {
+diff -urN openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-08-28 04:12:14.000000000 -0400
++++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-11-05 17:18:36.000000000 -0500
+@@ -78,6 +78,9 @@
+      */
+     public long            timeStamp ;
+ 
++    // TODO: IcedTea: I am a stub.
++    static public int trapAuthenticationFailure = 0;
++
+ 
+ 
+     /**
+diff -urN openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
+--- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java	2008-08-28 04:12:48.000000000 -0400
++++ openjdk/jdk/src/share/classes/java/beans/MetaData.java	2008-11-05 17:18:36.000000000 -0500
+@@ -1628,7 +1628,7 @@
+     }
+ 
+     private static String[] getAnnotationValue(Constructor<?> constructor) {
+-        ConstructorProperties annotation = constructor.getAnnotation(ConstructorProperties.class);
++        ConstructorProperties annotation = ((ConstructorProperties) constructor.getAnnotation(ConstructorProperties.class));
+         return (annotation != null)
+                 ? annotation.value()
+                 : null;


From gbenson at redhat.com  Thu Nov  6 03:22:59 2008
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 06 Nov 2008 11:22:59 +0000
Subject: changeset in /hg/icedtea6: 2008-11-06  Gary Benson  <gbenson@red...
Message-ID: <hg.bbb37067ce04.1225970579.2873452341184383832@icedtea.classpath.org>

changeset bbb37067ce04 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bbb37067ce04
description:
	2008-11-06  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
		(CppInterpreter::stack_overflow_imminent): New method.

		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
		(CppInterpreter::stack_overflow_imminent): New method.
		(CppInterpreter::normal_entry): Add stack overflow check.

diffstat:

3 files changed, 48 insertions(+), 1 deletion(-)
ChangeLog                                             |   12 +++++-
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |   33 +++++++++++++++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp |    4 ++

diffs (94 lines):

diff -r 6c81f8c8aab3 -r bbb37067ce04 ChangeLog
--- a/ChangeLog	Wed Nov 05 22:51:47 2008 -0500
+++ b/ChangeLog	Thu Nov 06 06:22:51 2008 -0500
@@ -1,3 +1,12 @@ 2008-11-05  Deepak Bhole  <dbhole at redhat
+2008-11-06  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
+	(CppInterpreter::stack_overflow_imminent): New method.
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::stack_overflow_imminent): New method.
+	(CppInterpreter::normal_entry): Add stack overflow check.
+
 2008-11-05  Deepak Bhole  <dbhole at redhat.com>
 
 	* patches/icedtea-copy-plugs.patch: Add netscape.* classes to rt.jar when
@@ -8,7 +17,8 @@ 2008-11-05  Deepak Bhole  <dbhole at redhat
 	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Correct
 	indentation from last commit, remove debug output.
 
-2008-11-05  Gary Benson  <gbenson at redhat.com>
+2008-11-05  Andrew Haley  <aph at redhat.com>
+	    Gary Benson  <gbenson at redhat.com>
 
 	* contrib/mixtec-hacks.patch: new file.
 
diff -r 6c81f8c8aab3 -r bbb37067ce04 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Wed Nov 05 22:51:47 2008 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Nov 06 06:22:51 2008 -0500
@@ -77,6 +77,13 @@ void CppInterpreter::main_loop(int recur
 
   intptr_t *result = NULL;
   int result_slots = 0;
+
+  // Check we're not about to run out of stack
+  if (stack_overflow_imminent(thread)) {
+    CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
+    goto unwind_and_return;
+  }
+
   while (true) {
     // We can set up the frame anchor with everything we want at
     // this point as we are thread_in_Java and no safepoints can
@@ -150,6 +157,8 @@ void CppInterpreter::main_loop(int recur
       break;
     }
   }
+
+ unwind_and_return:
 
   // Unwind the current frame
   thread->pop_zero_frame();
@@ -534,6 +543,30 @@ void CppInterpreter::empty_entry(methodO
 
   // Pop our parameters
   stack->set_sp(stack->sp() + method->size_of_parameters());
+}
+
+bool CppInterpreter::stack_overflow_imminent(JavaThread *thread)
+{
+  // How is the ABI stack?
+  address stack_top = thread->stack_base() - thread->stack_size();
+  int free_stack = os::current_stack_pointer() - stack_top;
+  if (free_stack < StackShadowPages * os::vm_page_size()) {
+    return true;
+  }
+
+  // How is the Zero stack?
+  // Throwing a StackOverflowError involves a VM call, which means
+  // we need a frame on the stack.  We should be checking here to
+  // ensure that methods we call have enough room to install the
+  // largest possible frame, but that's more than twice the size
+  // of the entire Zero stack we get by default, so we just check
+  // we have *some* space instead...
+  free_stack = thread->zero_stack()->available_words() * wordSize;
+  if (free_stack < StackShadowPages * os::vm_page_size()) {
+    return true;
+  }
+  
+  return false;
 }
 
 InterpreterFrame *InterpreterFrame::build(ZeroStack*       stack,
diff -r 6c81f8c8aab3 -r bbb37067ce04 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp	Wed Nov 05 22:51:47 2008 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp	Thu Nov 06 06:22:51 2008 -0500
@@ -38,3 +38,7 @@
  public:
   // Main loop of normal_entry
   static void main_loop(int recurse, TRAPS);
+
+ private:
+  // Stack overflow checks
+  static bool stack_overflow_imminent(JavaThread *thread);


From gbenson at redhat.com  Thu Nov  6 03:53:18 2008
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 06 Nov 2008 11:53:18 +0000
Subject: changeset in /hg/icedtea6: 2008-11-06  Gary Benson  <gbenson@red...
Message-ID: <hg.a261142d4db9.1225972398.2873452341184383832@icedtea.classpath.org>

changeset a261142d4db9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a261142d4db9
description:
	2008-11-06  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
		(CppInterpreter::native_entry): Add stack overflow check.

diffstat:

2 files changed, 80 insertions(+), 59 deletions(-)
ChangeLog                                             |    5 
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |  134 +++++++++--------

diffs (189 lines):

diff -r bbb37067ce04 -r a261142d4db9 ChangeLog
--- a/ChangeLog	Thu Nov 06 06:22:51 2008 -0500
+++ b/ChangeLog	Thu Nov 06 06:53:14 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-06  Gary Benson  <gbenson at redhat
+2008-11-06  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::native_entry): Add stack overflow check.
+
 2008-11-06  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
diff -r bbb37067ce04 -r a261142d4db9 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Nov 06 06:22:51 2008 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Nov 06 06:53:14 2008 -0500
@@ -173,6 +173,9 @@ void CppInterpreter::main_loop(int recur
 
 void CppInterpreter::native_entry(methodOop method, intptr_t UNUSED, TRAPS)
 {
+  // Make sure method is native and not abstract
+  assert(method->is_native() && !method->is_abstract(), "should be");
+
   JavaThread *thread = (JavaThread *) THREAD;
   ZeroStack *stack = thread->zero_stack();
 
@@ -182,11 +185,15 @@ void CppInterpreter::native_entry(method
   interpreterState istate = frame->interpreter_state();
   intptr_t *locals = istate->locals();
 
-  // Make sure method is native and not abstract
-  assert(method->is_native() && !method->is_abstract(), "should be");
+  // Check we're not about to run out of stack
+  if (stack_overflow_imminent(thread)) {
+    CALL_VM_NOCHECK(InterpreterRuntime::throw_StackOverflowError(thread));
+    goto unwind_and_return;
+  }
 
   // Lock if necessary
-  BasicObjectLock *monitor = NULL;
+  BasicObjectLock *monitor;
+  monitor = NULL;
   if (method->is_synchronized()) {
     monitor = (BasicObjectLock*) istate->stack_base();
     oop lockee = monitor->obj();
@@ -208,72 +215,79 @@ void CppInterpreter::native_entry(method
   }
 
   // Get the signature handler
-  address handlerAddr = method->signature_handler();
-  if (handlerAddr == NULL) {
-    CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
-    if (HAS_PENDING_EXCEPTION) {
-      thread->pop_zero_frame();
-      return;
-    }
-    handlerAddr = method->signature_handler();
-    assert(handlerAddr != NULL, "eh?");
-  }
-  if (handlerAddr == (address) InterpreterRuntime::slow_signature_handler) {
-    CALL_VM_NOCHECK(handlerAddr =
-      InterpreterRuntime::slow_signature_handler(thread, method, NULL, NULL));
-    if (HAS_PENDING_EXCEPTION) {
-      thread->pop_zero_frame();
-      return;
-    }
-  }
-  InterpreterRuntime::SignatureHandler *handler =
-    InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
+  InterpreterRuntime::SignatureHandler *handler;
+  {
+    address handlerAddr = method->signature_handler();
+    if (handlerAddr == NULL) {
+      CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
+      if (HAS_PENDING_EXCEPTION) {
+        thread->pop_zero_frame();
+        return;
+      }
+      handlerAddr = method->signature_handler();
+      assert(handlerAddr != NULL, "eh?");
+    }
+    if (handlerAddr == (address) InterpreterRuntime::slow_signature_handler) {
+      CALL_VM_NOCHECK(handlerAddr =
+        InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
+      if (HAS_PENDING_EXCEPTION) {
+        thread->pop_zero_frame();
+        return;
+      }
+    }
+    handler = \
+      InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);
+  }
 
   // Get the native function entry point
-  address function = method->native_function();
+  address function;
+  function = method->native_function();
   assert(function != NULL, "should be set if signature handler is");
 
   // Build the argument list
   if (handler->argument_count() * 2 > stack->available_words()) {
     Unimplemented();
   }
-  void **arguments =
-    (void **) stack->alloc(handler->argument_count() * sizeof(void **));
-  void **dst = arguments;
-
-  void *env = thread->jni_environment();
-  *(dst++) = &env;
-
-  void *mirror = NULL;
-  if (method->is_static()) {
-    istate->set_oop_temp(
-      method->constants()->pool_holder()->klass_part()->java_mirror());
-    mirror = istate->oop_temp_addr();
-    *(dst++) = &mirror;
-  }
-
-  intptr_t *src = locals;
-  for (int i = dst - arguments; i < handler->argument_count(); i++) {
-    ffi_type *type = handler->argument_type(i);
-    if (type == &ffi_type_pointer) {
-      if (*src) {
-        stack->push((intptr_t) src);
-        *(dst++) = stack->sp();
+  void **arguments;
+  {
+    arguments =
+      (void **) stack->alloc(handler->argument_count() * sizeof(void **));
+    void **dst = arguments;
+  
+    void *env = thread->jni_environment();
+    *(dst++) = &env;
+  
+    void *mirror = NULL;
+    if (method->is_static()) {
+      istate->set_oop_temp(
+        method->constants()->pool_holder()->klass_part()->java_mirror());
+      mirror = istate->oop_temp_addr();
+      *(dst++) = &mirror;
+    }
+  
+    intptr_t *src = locals;
+    for (int i = dst - arguments; i < handler->argument_count(); i++) {
+      ffi_type *type = handler->argument_type(i);
+      if (type == &ffi_type_pointer) {
+        if (*src) {
+          stack->push((intptr_t) src);
+          *(dst++) = stack->sp();
+        }
+        else {
+          *(dst++) = src;
+        }
+        src--;
+      }
+      else if (type->size == 4) {
+        *(dst++) = src--;
+      }
+      else if (type->size == 8) {
+        src--;
+        *(dst++) = src--;
       }
       else {
-        *(dst++) = src;
-      }
-      src--;
-    }
-    else if (type->size == 4) {
-      *(dst++) = src--;
-    }
-    else if (type->size == 8) {
-      src--;
-      *(dst++) = src--;
-    }
-    else {
-      ShouldNotReachHere();
+        ShouldNotReachHere();
+      }
     }
   }
 
@@ -326,6 +340,8 @@ void CppInterpreter::native_entry(method
       }
     }
   }
+
+ unwind_and_return:
 
   // Unwind the current activation
   thread->pop_zero_frame();


From gbenson at redhat.com  Thu Nov  6 04:00:24 2008
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 06 Nov 2008 12:00:24 +0000
Subject: changeset in /hg/icedtea6: 2008-11-06  Gary Benson  <gbenson@red...
Message-ID: <hg.2edccb28b389.1225972824.2873452341184383832@icedtea.classpath.org>

changeset 2edccb28b389 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2edccb28b389
description:
	2008-11-06  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
		(CppInterpreter::native_entry): Unwind correctly if an
		exception is thrown while setting up the call.

diffstat:

2 files changed, 13 insertions(+), 12 deletions(-)
ChangeLog                                             |    6 +++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp |   19 ++++++-----------

diffs (55 lines):

diff -r a261142d4db9 -r 2edccb28b389 ChangeLog
--- a/ChangeLog	Thu Nov 06 06:53:14 2008 -0500
+++ b/ChangeLog	Thu Nov 06 07:00:19 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-06  Gary Benson  <gbenson at redhat
+2008-11-06  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::native_entry): Unwind correctly if an
+	exception is thrown while setting up the call.
+
 2008-11-06  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
diff -r a261142d4db9 -r 2edccb28b389 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Nov 06 06:53:14 2008 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Nov 06 07:00:19 2008 -0500
@@ -206,10 +206,8 @@ void CppInterpreter::native_entry(method
       }
       else {
         CALL_VM_NOCHECK(InterpreterRuntime::monitorenter(thread, monitor));
-        if (HAS_PENDING_EXCEPTION) {
-          thread->pop_zero_frame();
-          return;
-        }
+        if (HAS_PENDING_EXCEPTION)
+          goto unwind_and_return;
       }
     }
   }
@@ -220,20 +218,17 @@ void CppInterpreter::native_entry(method
     address handlerAddr = method->signature_handler();
     if (handlerAddr == NULL) {
       CALL_VM_NOCHECK(InterpreterRuntime::prepare_native_call(thread, method));
-      if (HAS_PENDING_EXCEPTION) {
-        thread->pop_zero_frame();
-        return;
-      }
+      if (HAS_PENDING_EXCEPTION)
+        goto unwind_and_return;
+
       handlerAddr = method->signature_handler();
       assert(handlerAddr != NULL, "eh?");
     }
     if (handlerAddr == (address) InterpreterRuntime::slow_signature_handler) {
       CALL_VM_NOCHECK(handlerAddr =
         InterpreterRuntime::slow_signature_handler(thread, method, NULL,NULL));
-      if (HAS_PENDING_EXCEPTION) {
-        thread->pop_zero_frame();
-        return;
-      }
+      if (HAS_PENDING_EXCEPTION)
+        goto unwind_and_return;
     }
     handler = \
       InterpreterRuntime::SignatureHandler::from_handlerAddr(handlerAddr);


From mark at klomp.org  Thu Nov  6 04:49:09 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 06 Nov 2008 13:49:09 +0100
Subject: Public open specs
In-Reply-To: <1225361534.3289.11.camel@dijkstra.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<48D0C79F.1080909@redhat.com>
	<20080917235155.GA10355@rivendell.middle-earth.co.uk>
	<20080918010821.GD10250@bamboo.destinee.acro.gen.nz>
	<loom.20080918T020345-276@post.gmane.org>
	<17c6771e0809180328s3aeacca4m8a3969ba2abf4c84@mail.gmail.com>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeest.org>
Message-ID: <1225975749.4621.5.camel@dijkstra.wildebeest.org>

Hi Dalibor,

On Thu, 2008-10-30 at 11:12 +0100, Mark Wielaard wrote:
> On Tue, 2008-10-21 at 21:16 +0200, Mark Wielaard wrote:
> > On Tue, 2008-10-14 at 19:55 +0200, Dalibor Topic wrote:
> > > Not yet (outside the JSR spec document). The process bottleneck is
> > > identified, working on a fix.
> > 
> > That is great! Any timelines for these process fixes to be cleared up?
> > It has been a little funny that Sun is now producing GPLed code for the
> > various JSRs they lead, but still publish the JSR specs themselves under
> > terms that conflict (through the 2a-c restrictions) with the liberties
> > granted by the GPL. I came up with the following list of JSRs that have
> > a Sun lead and for which OpenJDK provides (prototype) GPL code, but
> > which are published under non-free terms preventing others to also
> > publish (independent) implementations or extend the OpenJDK provided
> > ones:
> > 
> > JSR 105: XML Digital Signature APIs
> > JSR 199: Java Compiler API
> > JSR 202: JavaTM Class File Specification Update
> > JSR 203: More New I/O APIs for the JavaTM Platform ("NIO.2")
> > JSR 221: JDBC 4.0 API Specification
> > JSR 222: Java Architecture for XML Binding (JAXB) 2.0
> > JSR 223: Scripting for the Java Platform
> > JSR 224: Java API for XML-Based Web Services (JAX-WS) 2.0
> > JSR 250: Common Annotations for the Java Platform
> > JSR 255: Java Management Extensions (JMX) Specification, version 2.0
> > JSR 269: Pluggable Annotation Processing API
> > JSR 270: Java SE 6 Release Contents
> > JSR 277: Java Module System
> > JSR 292: Supporting Dynamically Typed Languages on the Java Platform
> > JSR 294: Improved Modularity Support in the Java Programming Language
> > 
> > Would be great to see all these specs finally liberated.
> 
> Any progress on the fix to the process bottlenecks so these Sun
> controlled specs that are essential for OpenJDK can be freely and openly
> published?

Ping?

Thanks,

Mark



From gbenson at redhat.com  Thu Nov  6 05:02:07 2008
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 06 Nov 2008 13:02:07 +0000
Subject: changeset in /hg/icedtea6: 2008-11-06  Gary Benson  <gbenson@red...
Message-ID: <hg.9e45d56689ab.1225976526.2873452341184383832@icedtea.classpath.org>

changeset 9e45d56689ab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9e45d56689ab
description:
	2008-11-06  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
		(StackShadowPages): Increase for debug builds.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog                                      |    5 +++++
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp |    2 +-

diffs (24 lines):

diff -r 2edccb28b389 -r 9e45d56689ab ChangeLog
--- a/ChangeLog	Thu Nov 06 07:00:19 2008 -0500
+++ b/ChangeLog	Thu Nov 06 08:02:02 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-06  Gary Benson  <gbenson at redhat
+2008-11-06  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
+	(StackShadowPages): Increase for debug builds.
+
 2008-11-06  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
diff -r 2edccb28b389 -r 9e45d56689ab ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Thu Nov 06 07:00:19 2008 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Thu Nov 06 08:02:02 2008 -0500
@@ -48,7 +48,7 @@ define_pd_global(intx,  PreInflateSpin, 
 
 define_pd_global(intx,  StackYellowPages,         2);
 define_pd_global(intx,  StackRedPages,            1);
-define_pd_global(intx,  StackShadowPages,         3 DEBUG_ONLY(+1));
+define_pd_global(intx,  StackShadowPages,         3 DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,         true);
 define_pd_global(bool,  RewriteFrequentPairs,     true);


From aph at redhat.com  Thu Nov  6 06:01:09 2008
From: aph at redhat.com (Andrew Haley)
Date: Thu, 06 Nov 2008 14:01:09 +0000
Subject: Source code layout versus Eclipse
Message-ID: <4912F8A5.1060806@redhat.com>

I've noticed that some IcedTea commits have rather messed-up
formatting and wondered why.  The cause seems to be that Eclipse,
unlike every other tool in GNU/Linux systems, defaults to four
character wide tab stops.  This means that if you edit with anything
other than Eclipse, post patches in mail, etc., the indentation is
wrong.

Here's how to fix it, thanks to Deepak:

Go to Window->Preferences->Java->Code Style->Formatter->"New..."

Type in a name for the new profile, and select "Eclipse [built-in]" as
the template. In the dialog that follows hitting OK (assuming "Open
the editor" dialog was checked), for "Tab Policy" select "Spaces
only". The default Indentation and tab size should be 4, you don't
need to change that. And that is it.. once you hit OK, Eclipse should
show the new profile as the "Active Profile", and if it doesn't, you
need to select it from the drop down list.

Andrew.


From mark at klomp.org  Thu Nov  6 06:17:15 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 06 Nov 2008 15:17:15 +0100
Subject: Cleaning up crypto support
In-Reply-To: <1222940970.3265.16.camel@dijkstra.wildebeest.org>
References: <1219931049.4019.32.camel@dijkstra.wildebeest.org>
	<1222369008.3266.91.camel@dijkstra.wildebeest.org>
	<1222940970.3265.16.camel@dijkstra.wildebeest.org>
Message-ID: <1225981035.4621.19.camel@dijkstra.wildebeest.org>

Hi,

On Thu, 2008-10-02 at 11:49 +0200, Mark Wielaard wrote:
> On Thu, 2008-09-25 at 20:56 +0200, Mark Wielaard wrote:
> > I believe this version is pretty clean. And it should be simple to
> > verify that it works correctly now since all unnecessary code is just
> > thrown out. Of course I threw all the crypto and security tests at it
> > that I could find and all happily passed. I did alter the TestUtil class
> > so that it always checks all algorithms and full keys.
> > 
> > It would be nice to push this in OpenJDK proper so there is less
> > divergence and so the GPLed version always has full crypto support
> > enabled.
> > 
> > If you still want to support a ClosedJDK with restricted crypto support
> > then all you have to do it provide your own Cipher and JceSecurity
> > class, plus any of the now removed auxiliary classes JarVerfifier and
> > JceSecurityManager. Everything else can be the same between the free
> > openjdk and proprietary closedjdk.
> > 
> > Please let me know if you would need any help integrating this.
> > I did already push it into icedtea6.
> 
> I didn't see any replies to this yet. Please do let me know if I can
> help in any way to get this pushed forward faster.

It seems this is working out good for the GNU/Linux distros based on the
latest IcedTea6 releases, so getting this upstream would be nice.
Anything I can do to help with that?

Thanks,

Mark



From mark at klomp.org  Thu Nov  6 06:27:09 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 06 Nov 2008 15:27:09 +0100
Subject: OpenJDK 6 build 12 source posted (directaudio/alsa backend)
In-Reply-To: <48D7F80E.6060802@sun.com>
References: <48CAB08F.6010407@sun.com>
	<1221402124.3542.40.camel@dijkstra.wildebeest.org>
	<48D7F80E.6060802@sun.com>
Message-ID: <1225981629.4621.25.camel@dijkstra.wildebeest.org>

Hi Joe, hi Alex,

On Mon, 2008-09-22 at 12:54 -0700, Joseph D. Darcy wrote:
> Mark Wielaard wrote:
> > Although not in your changelogs, I saw you also included two of my fixes
> > for the ALSA directaudio backend which I posted back in May on
> > sound-dev, and which are included in icedtea already.
> > - The sloppy open/close patch:
> > http://mail.openjdk.java.net/pipermail/sound-dev/2008-May/000053.html
> > - The ALSA native lock patch:
> > http://mail.openjdk.java.net/pipermail/sound-dev/2008-May/000054.html
> >
> > Although it makes some applets that use some primitive sound output work
> > better I never got a real response. Did you get someone from the sound
> > team to look at these patches? They do seem to work for me and the few
> > test users of those applets, but a full review by one of the sound
> > engineers would be appreciated. They don't seem to be in the JDK7 tree.
> >   
> No; the patches were not explicitly reviewed; Alex, please take a look 
> at them.

While these are being reviewed it might be nice if some of the
additional fixes for the DirectAudio ALSA code that were added by Omair
were also reviewed:

- Use the ALSA 'default' device if possible.
  patches/icedtea-alsa-default-device.patch
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-November/003844.html

- Fix linker order:
  patches/icedtea-linker-libs-order.patch
http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-November/003845.html

Thanks,

Mark



From gbenson at redhat.com  Thu Nov  6 09:14:36 2008
From: gbenson at redhat.com (Gary Benson)
Date: Thu, 06 Nov 2008 17:14:36 +0000
Subject: changeset in /hg/icedtea6: 2008-11-06  Gary Benson  <gbenson@red...
Message-ID: <hg.b182fe895dda.1225991676.2873452341184383832@icedtea.classpath.org>

changeset b182fe895dda in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b182fe895dda
description:
	2008-11-06  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
		(JVM_handle_linux_signal): Added signal chaining,
		abort_if_unrecognised, and stack overflow recognition.

diffstat:

2 files changed, 70 insertions(+)
ChangeLog                                                |    6 +
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |   64 ++++++++++++++

diffs (94 lines):

diff -r 9e45d56689ab -r b182fe895dda ChangeLog
--- a/ChangeLog	Thu Nov 06 08:02:02 2008 -0500
+++ b/ChangeLog	Thu Nov 06 12:14:32 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-06  Gary Benson  <gbenson at redhat
+2008-11-06  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(JVM_handle_linux_signal): Added signal chaining,
+	abort_if_unrecognised, and stack overflow recognition.
+
 2008-11-06  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
diff -r 9e45d56689ab -r b182fe895dda ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Thu Nov 06 08:02:02 2008 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Thu Nov 06 12:14:32 2008 -0500
@@ -131,6 +131,60 @@ JVM_handle_linux_signal(int sig,
   }
 
   if (info != NULL && thread != NULL) {
+    // Handle ALL stack overflow variations here
+    if (sig == SIGSEGV) {
+      address addr = (address) info->si_addr;
+
+      // check if fault address is within thread stack
+      if (addr < thread->stack_base() &&
+          addr >= thread->stack_base() - thread->stack_size()) {
+        // stack overflow
+        if (thread->in_stack_yellow_zone(addr)) {
+          thread->disable_stack_yellow_zone();
+          Unimplemented();
+        }
+        else if (thread->in_stack_red_zone(addr)) {
+          thread->disable_stack_red_zone();
+          Unimplemented();
+        }
+        else {
+          // Accessing stack address below sp may cause SEGV if
+          // current thread has MAP_GROWSDOWN stack. This should
+          // only happen when current thread was created by user
+          // code with MAP_GROWSDOWN flag and then attached to VM.
+          // See notes in os_linux.cpp.
+          if (thread->osthread()->expanding_stack() == 0) {
+            thread->osthread()->set_expanding_stack();
+            if (os::Linux::manually_expand_stack(thread, addr)) {
+              thread->osthread()->clear_expanding_stack();
+              return true;
+            }
+            thread->osthread()->clear_expanding_stack();
+          }
+          else {
+            fatal("recursive segv. expanding stack.");
+          }
+        } 
+      }
+    }
+
+    /*if (thread->thread_state() == _thread_in_Java) {
+      Unimplemented();
+    }
+    else*/ if (thread->thread_state() == _thread_in_vm &&
+               sig == SIGBUS && thread->doing_unsafe_access()) {
+      Unimplemented();
+    }
+
+    // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC
+    // kicks in and the heap gets shrunk before the field access.
+    /*if (sig == SIGSEGV || sig == SIGBUS) {
+      address addr = JNI_FastGetField::find_slowcase_pc(pc);
+      if (addr != (address)-1) {
+        stub = addr;
+      }
+    }*/
+
     // Check to see if we caught the safepoint code in the process
     // of write protecting the memory serialization page.  It write
     // enables the page immediately after protecting it so we can
@@ -141,6 +195,16 @@ JVM_handle_linux_signal(int sig,
       os::block_on_serialize_page_trap();
       return true;
     }
+  }
+
+  // signal-chaining
+  if (os::Linux::chained_handler(sig, info, ucVoid)) {
+     return true;
+  }
+
+  if (!abort_if_unrecognized) {
+    // caller wants another chance, so give it to him
+    return false;
   }
 
 #ifndef PRODUCT


From gbenson at redhat.com  Fri Nov  7 02:36:58 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 07 Nov 2008 10:36:58 +0000
Subject: changeset in /hg/icedtea6: 2008-11-07  Gary Benson  <gbenson@red...
Message-ID: <hg.56fbf813637d.1226054218.2873452341184383832@icedtea.classpath.org>

changeset 56fbf813637d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=56fbf813637d
description:
	2008-11-07  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
		(frame::interpreter_frame_result): Implemented.

diffstat:

2 files changed, 57 insertions(+), 1 deletion(-)
ChangeLog                                    |    5 ++
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp |   53 +++++++++++++++++++++++++-

diffs (75 lines):

diff -r b182fe895dda -r 56fbf813637d ChangeLog
--- a/ChangeLog	Thu Nov 06 12:14:32 2008 -0500
+++ b/ChangeLog	Fri Nov 07 05:36:53 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-06  Gary Benson  <gbenson at redhat
+2008-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
+	(frame::interpreter_frame_result): Implemented.
+
 2008-11-06  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
diff -r b182fe895dda -r 56fbf813637d ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Thu Nov 06 12:14:32 2008 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Fri Nov 07 05:36:53 2008 -0500
@@ -133,7 +133,58 @@ BasicType frame::interpreter_frame_resul
 BasicType frame::interpreter_frame_result(oop* oop_result,
                                           jvalue* value_result)
 {
-  Unimplemented();
+  assert(is_interpreted_frame(), "interpreted frame expected");
+  methodOop method = interpreter_frame_method();
+  BasicType type = method->result_type();
+  intptr_t* tos_addr = (intptr_t *) interpreter_frame_tos_address();
+  oop obj;
+
+  switch (type) {
+  case T_VOID:
+    break;
+  case T_BOOLEAN:
+    value_result->z = *(jboolean *) tos_addr;
+    break;
+  case T_BYTE:
+    value_result->b = *(jbyte *) tos_addr;
+    break;
+  case T_CHAR:
+    value_result->c = *(jchar *) tos_addr;
+    break;
+  case T_SHORT:
+    value_result->s = *(jshort *) tos_addr;
+    break;
+  case T_INT:
+    value_result->i = *(jint *) tos_addr;
+    break;
+  case T_LONG:
+    value_result->j = *(jlong *) tos_addr;
+    break;
+  case T_FLOAT:
+    value_result->f = *(jfloat *) tos_addr;
+    break;
+  case T_DOUBLE:
+    value_result->d = *(jdouble *) tos_addr;
+    break;
+
+  case T_OBJECT: 
+  case T_ARRAY:
+    if (method->is_native()) {
+      obj = get_interpreterState()->oop_temp();
+    }
+    else {
+      oop* obj_p = (oop *) tos_addr;
+      obj = (obj_p == NULL) ? (oop) NULL : *obj_p;
+    }
+    assert(obj == NULL || Universe::heap()->is_in(obj), "sanity check");
+    *oop_result = obj;
+    break;
+
+  default:
+    ShouldNotReachHere();
+  }
+
+  return type;
 }
 
 int frame::frame_size() const


From gbenson at redhat.com  Fri Nov  7 02:51:16 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 07 Nov 2008 10:51:16 +0000
Subject: changeset in /hg/icedtea6: 2008-11-07  Gary Benson  <gbenson@red...
Message-ID: <hg.59b0e40b0d30.1226055076.2873452341184383832@icedtea.classpath.org>

changeset 59b0e40b0d30 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=59b0e40b0d30
description:
	2008-11-07  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
		(Atomic::store_ptr): Implemented.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog                                                           |    5 +++++
ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp |    2 +-

diffs (24 lines):

diff -r 56fbf813637d -r 59b0e40b0d30 ChangeLog
--- a/ChangeLog	Fri Nov 07 05:36:53 2008 -0500
+++ b/ChangeLog	Fri Nov 07 05:51:11 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-07  Gary Benson  <gbenson at redhat
+2008-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
+	(Atomic::store_ptr): Implemented.
+
 2008-11-07  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
diff -r 56fbf813637d -r 59b0e40b0d30 ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp	Fri Nov 07 05:36:53 2008 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp	Fri Nov 07 05:51:11 2008 -0500
@@ -174,7 +174,7 @@ inline void Atomic::store(jint store_val
 
 inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest)
 {
-  Unimplemented();
+  *dest = store_value;
 }
 
 inline jint Atomic::add(jint add_value, volatile jint* dest)


From gbenson at redhat.com  Fri Nov  7 03:51:04 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 07 Nov 2008 11:51:04 +0000
Subject: changeset in /hg/icedtea6: 2008-11-07  Gary Benson  <gbenson@red...
Message-ID: <hg.bddf55be4f36.1226058664.2873452341184383832@icedtea.classpath.org>

changeset bddf55be4f36 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bddf55be4f36
description:
	2008-11-07  Gary Benson  <gbenson at redhat.com>

		* patches/icedtea-cc-interp-no-fer.patch: New file.
		* Makefile.am (ICEDTEA_PATCHES): Apply the above.
		* HACKING: Document the above.

diffstat:

4 files changed, 24 insertions(+), 1 deletion(-)
ChangeLog                              |    6 ++++++
HACKING                                |    1 +
Makefile.am                            |    3 ++-
patches/icedtea-cc-interp-no-fer.patch |   15 +++++++++++++++

diffs (56 lines):

diff -r 59b0e40b0d30 -r bddf55be4f36 ChangeLog
--- a/ChangeLog	Fri Nov 07 05:51:11 2008 -0500
+++ b/ChangeLog	Fri Nov 07 06:50:49 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-07  Gary Benson  <gbenson at redhat
+2008-11-07  Gary Benson  <gbenson at redhat.com>
+
+	* patches/icedtea-cc-interp-no-fer.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2008-11-07  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
diff -r 59b0e40b0d30 -r bddf55be4f36 HACKING
--- a/HACKING	Fri Nov 07 05:51:11 2008 -0500
+++ b/HACKING	Fri Nov 07 06:50:49 2008 -0500
@@ -64,6 +64,7 @@ The following patches are currently appl
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
 * icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
+* icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 59b0e40b0d30 -r bddf55be4f36 Makefile.am
--- a/Makefile.am	Fri Nov 07 05:51:11 2008 -0500
+++ b/Makefile.am	Fri Nov 07 06:50:49 2008 -0500
@@ -535,7 +535,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-renderer-crossing.patch \
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
-	patches/icedtea-f2i-overflow.patch
+	patches/icedtea-f2i-overflow.patch \
+	patches/icedtea-cc-interp-no-fer.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 59b0e40b0d30 -r bddf55be4f36 patches/icedtea-cc-interp-no-fer.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-cc-interp-no-fer.patch	Fri Nov 07 06:50:49 2008 -0500
@@ -0,0 +1,15 @@
+diff -r 11b9bdd4bbd3 openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp
+--- openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp	Fri Nov 07 10:53:57 2008 +0000
++++ openjdk/hotspot/src/share/vm/prims/jvmtiManageCapabilities.cpp	Fri Nov 07 11:29:34 2008 +0000
+@@ -116,7 +116,11 @@ jvmtiCapabilities JvmtiManageCapabilitie
+   
+   memset(&jc, 0, sizeof(jc));
+   jc.can_pop_frame = 1;
++#ifdef CC_INTERP
++  jc.can_force_early_return = 0;
++#else
+   jc.can_force_early_return = 1;
++#endif // CC_INTERP
+   jc.can_get_source_debug_extension = 1;
+   jc.can_access_local_variables = 1;
+   jc.can_maintain_original_method_order = 1;


From bugzilla-daemon at icedtea.classpath.org  Fri Nov  7 04:24:14 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 07 Nov 2008 12:24:14 +0000
Subject: [Bug 185] Application SweetHome 3D crashes when i want to print
Message-ID: <E1KyQNq-0003QW-G5@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=185





------- Comment #2 from davalv at alice.it  2008-11-07 12:24 -------
(In reply to comment #1)
> where can i get this app to try to reproduce this? or can you retest this with
> the most recent version of icedtea6?
> 

http://sweethome3d.sourceforge.net


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Fri Nov  7 05:02:09 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 07 Nov 2008 13:02:09 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-6761856-freetypesca...
Message-ID: <hg.7175ea5857e4.1226062929.2873452341184383832@icedtea.classpath.org>

changeset 7175ea5857e4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7175ea5857e4
description:
	* patches/icedtea-6761856-freetypescaler.patch: New patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.
		* HACKING: Document new patch.

diffstat:

4 files changed, 59 insertions(+), 3 deletions(-)
ChangeLog                                    |    6 +++
HACKING                                      |    6 ++-
Makefile.am                                  |    3 +
patches/icedtea-6761856-freetypescaler.patch |   47 ++++++++++++++++++++++++++

diffs (93 lines):

diff -r 5176cf42d236 -r 7175ea5857e4 ChangeLog
--- a/ChangeLog	Wed Oct 29 11:29:20 2008 -0400
+++ b/ChangeLog	Fri Nov 07 13:47:41 2008 +0100
@@ -1,3 +1,9 @@ 2008-10-29  Gary Benson  <gbenson at redhat
+2008-10-29  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-6761856-freetypescaler.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-10-29  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/238:
diff -r 5176cf42d236 -r 7175ea5857e4 HACKING
--- a/HACKING	Wed Oct 29 11:29:20 2008 -0400
+++ b/HACKING	Fri Nov 07 13:47:41 2008 +0100
@@ -62,8 +62,10 @@ The following patches are currently appl
 * icedtea-arch.patch: Add support for additional architectures.
 * icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
-* patches/icedtea-renderer-crossing.patch: Check whether crossing is
-  initialized in Pisces Renderer.
+* icedtea-renderer-crossing.patch: Check whether crossing is initialized
+  in Pisces Renderer.
+* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
+  #6761856, swing TextLayout.getBounds() returns shifted bounds.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 5176cf42d236 -r 7175ea5857e4 Makefile.am
--- a/Makefile.am	Wed Oct 29 11:29:20 2008 -0400
+++ b/Makefile.am	Fri Nov 07 13:47:41 2008 +0100
@@ -532,7 +532,8 @@ ICEDTEA_PATCHES = \
 	$(VISUALVM_PATCH) \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
-	patches/icedtea-renderer-crossing.patch
+	patches/icedtea-renderer-crossing.patch \
+	patches/icedtea-6761856-freetypescaler.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 5176cf42d236 -r 7175ea5857e4 patches/icedtea-6761856-freetypescaler.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6761856-freetypescaler.patch	Fri Nov 07 13:47:41 2008 +0100
@@ -0,0 +1,47 @@
+# User igor
+# Date 1225234342 -10800
+# Node ID 9cdababf6179bd03270d881740fbb5dcc405854f
+# Parent 594c52582b21063bdbc36b38d9f73a3c46abe041
+6761856: OpenJDK: vertical text metrics may be significanly different from those returned by Sun JDK
+Reviewed-by: bae, prr
+
+--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	Tue Oct 28 14:47:14 2008 -0700
++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	Wed Oct 29 01:52:22 2008 +0300
+@@ -1281,7 +1281,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+                                    sunFontIDs.rect2DFloatClass,
+                                    sunFontIDs.rect2DFloatCtr4,
+                                    F26Dot6ToFloat(bbox.xMin),
+-                                   F26Dot6ToFloat(bbox.yMax),
++                                   F26Dot6ToFloat(-bbox.yMax),
+                                    F26Dot6ToFloat(bbox.xMax-bbox.xMin),
+                                    F26Dot6ToFloat(bbox.yMax-bbox.yMin));
+     }
+--- openjdk.orig/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java	Tue Oct 28 14:47:14 2008 -0700
++++ openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java	Wed Oct 29 01:52:22 2008 +0300
+@@ -22,7 +22,7 @@
+  */
+ /* @test
+  * @summary verify TextLayout.getBounds() return visual bounds
+- * @bug 6323611
++ * @bug 6323611 6761856
+  */
+ 
+ import java.awt.*;
+@@ -39,10 +39,15 @@ public class TextLayoutBounds {
+        Rectangle2D tlBounds = tl.getBounds();
+        GlyphVector gv = f.createGlyphVector(frc, s);
+        Rectangle2D gvvBounds = gv.getVisualBounds();
++       Rectangle2D oBounds = tl.getOutline(null).getBounds2D();
+        System.out.println("tlbounds="+tlBounds);
+        System.out.println("gvbounds="+gvvBounds);
++       System.out.println("outlineBounds="+oBounds);
+        if (!gvvBounds.equals(tlBounds)) {
+-          throw new RuntimeException("Bounds differ");
++          throw new RuntimeException("Bounds differ [gvv != tl]");
++       }
++       if (!tlBounds.equals(oBounds)) {
++          throw new RuntimeException("Bounds differ [tl != outline]");
+        }
+     }
+ }
+


From mark at klomp.org  Fri Nov  7 05:02:10 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 07 Nov 2008 13:02:10 +0000
Subject: changeset in /hg/icedtea6: Merge with trunk.
Message-ID: <hg.cb1f68e8019a.1226062930.2873452341184383832@icedtea.classpath.org>

changeset cb1f68e8019a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cb1f68e8019a
description:
	Merge with trunk.

diffstat:

4 files changed, 57 insertions(+), 1 deletion(-)
ChangeLog                                    |    6 +++
HACKING                                      |    2 +
Makefile.am                                  |    3 +
patches/icedtea-6761856-freetypescaler.patch |   47 ++++++++++++++++++++++++++

diffs (89 lines):

diff -r bddf55be4f36 -r cb1f68e8019a ChangeLog
--- a/ChangeLog	Fri Nov 07 06:50:49 2008 -0500
+++ b/ChangeLog	Fri Nov 07 13:54:54 2008 +0100
@@ -1,3 +1,9 @@ 2008-11-07  Gary Benson  <gbenson at redhat
+2008-10-29  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-6761856-freetypescaler.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-11-07  Gary Benson  <gbenson at redhat.com>
 
 	* patches/icedtea-cc-interp-no-fer.patch: New file.
diff -r bddf55be4f36 -r cb1f68e8019a HACKING
--- a/HACKING	Fri Nov 07 06:50:49 2008 -0500
+++ b/HACKING	Fri Nov 07 13:54:54 2008 +0100
@@ -65,6 +65,8 @@ The following patches are currently appl
 * icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
 * icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
+* icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
+  #6761856, swing TextLayout.getBounds() returns shifted bounds.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r bddf55be4f36 -r cb1f68e8019a Makefile.am
--- a/Makefile.am	Fri Nov 07 06:50:49 2008 -0500
+++ b/Makefile.am	Fri Nov 07 13:54:54 2008 +0100
@@ -536,7 +536,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
 	patches/icedtea-f2i-overflow.patch \
-	patches/icedtea-cc-interp-no-fer.patch
+	patches/icedtea-cc-interp-no-fer.patch \
+	patches/icedtea-6761856-freetypescaler.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r bddf55be4f36 -r cb1f68e8019a patches/icedtea-6761856-freetypescaler.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6761856-freetypescaler.patch	Fri Nov 07 13:54:54 2008 +0100
@@ -0,0 +1,47 @@
+# User igor
+# Date 1225234342 -10800
+# Node ID 9cdababf6179bd03270d881740fbb5dcc405854f
+# Parent 594c52582b21063bdbc36b38d9f73a3c46abe041
+6761856: OpenJDK: vertical text metrics may be significanly different from those returned by Sun JDK
+Reviewed-by: bae, prr
+
+--- openjdk.orig/jdk/src/share/native/sun/font/freetypeScaler.c	Tue Oct 28 14:47:14 2008 -0700
++++ openjdk/jdk/src/share/native/sun/font/freetypeScaler.c	Wed Oct 29 01:52:22 2008 +0300
+@@ -1281,7 +1281,7 @@ Java_sun_font_FreetypeFontScaler_getGlyp
+                                    sunFontIDs.rect2DFloatClass,
+                                    sunFontIDs.rect2DFloatCtr4,
+                                    F26Dot6ToFloat(bbox.xMin),
+-                                   F26Dot6ToFloat(bbox.yMax),
++                                   F26Dot6ToFloat(-bbox.yMax),
+                                    F26Dot6ToFloat(bbox.xMax-bbox.xMin),
+                                    F26Dot6ToFloat(bbox.yMax-bbox.yMin));
+     }
+--- openjdk.orig/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java	Tue Oct 28 14:47:14 2008 -0700
++++ openjdk/jdk/test/java/awt/font/TextLayout/TextLayoutBounds.java	Wed Oct 29 01:52:22 2008 +0300
+@@ -22,7 +22,7 @@
+  */
+ /* @test
+  * @summary verify TextLayout.getBounds() return visual bounds
+- * @bug 6323611
++ * @bug 6323611 6761856
+  */
+ 
+ import java.awt.*;
+@@ -39,10 +39,15 @@ public class TextLayoutBounds {
+        Rectangle2D tlBounds = tl.getBounds();
+        GlyphVector gv = f.createGlyphVector(frc, s);
+        Rectangle2D gvvBounds = gv.getVisualBounds();
++       Rectangle2D oBounds = tl.getOutline(null).getBounds2D();
+        System.out.println("tlbounds="+tlBounds);
+        System.out.println("gvbounds="+gvvBounds);
++       System.out.println("outlineBounds="+oBounds);
+        if (!gvvBounds.equals(tlBounds)) {
+-          throw new RuntimeException("Bounds differ");
++          throw new RuntimeException("Bounds differ [gvv != tl]");
++       }
++       if (!tlBounds.equals(oBounds)) {
++          throw new RuntimeException("Bounds differ [tl != outline]");
+        }
+     }
+ }
+


From mark at klomp.org  Fri Nov  7 05:05:47 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 07 Nov 2008 14:05:47 +0100
Subject: <AWT Dev> [OpenJDK 2D-Dev]  Bad component spacing
In-Reply-To: <49132DBC.5080106@sun.com>
References: <4912D242.1010404@sun.com> <4912E2AF.6090708@sun.com>
	<49132DBC.5080106@sun.com>
Message-ID: <1226063147.3310.12.camel@dijkstra.wildebeest.org>

Hi,

On Thu, 2008-11-06 at 20:47 +0300, Igor Nekrestyanov wrote:
> This is likely to be same as
>   http://monaco.sfbay.sun.com/detail.jsf?cr=6761856
> that was recently fixed and did not make it into main openjdk ws yet but 
> you can pull these changes from 2D workspace to test.

For those in the community without access to internal sun machines this
is: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6761856
and: http://hg.openjdk.java.net/jdk7/2d-gate/jdk/rev/9cdababf6179

This was also reported against IcedTea as:
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=227

I have imported the patch into IcedTea6 and tested that it fixes the
mentioned issues:

2008-10-29  Mark Wielaard  <mark at klomp.org>

   * patches/icedtea-6761856-freetypescaler.patch: New patch.
   * Makefile.am (ICEDTEA_PATCHES): Add new patch.
   * HACKING: Document new patch.

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Fri Nov  7 05:06:58 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 07 Nov 2008 13:06:58 +0000
Subject: [Bug 227] swing TextLayout.getBounds() returns shifted bounds
Message-ID: <E1KyR3C-0003UF-Sq@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=227


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #5 from mark at klomp.org  2008-11-07 13:06 -------
changeset:   1167:7175ea5857e4
user:        Mark Wielaard <mark at klomp.org>
date:        Fri Nov 07 13:47:41 2008 +0100
files:       ChangeLog HACKING Makefile.am
patches/icedtea-6761856-freetypescaler.patch
description:
* patches/icedtea-6761856-freetypescaler.patch: New patch.
        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
        * HACKING: Document new patch.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From gbenson at redhat.com  Fri Nov  7 05:18:05 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 7 Nov 2008 13:18:05 +0000
Subject: changeset in /hg/icedtea6: Add IcedTea version to java -version.
In-Reply-To: <hg.829a4250db62.1224088341.2873452341184383832@icedtea.classpath.org>
References: <hg.829a4250db62.1224088341.2873452341184383832@icedtea.classpath.org>
Message-ID: <20081107131805.GD4439@redhat.com>

Andrew John Hughes wrote:
> changeset 829a4250db62 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=829a4250db62
> description:
> 	Add IcedTea version to java -version.
[snip]
> +	if [ -e $(abs_top_srcdir)/.hg ]; then \
> +	  revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
> +	fi ; \
> +	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
> +	sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk

The number reported by '{rev}' is only meaningful within your own
repository.  Anyone mind if I change this to '{node|short}'?

Cheers,
Gary

-- 
http://gbenson.net/


From gnu_andrew at member.fsf.org  Fri Nov  7 06:08:32 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 7 Nov 2008 14:08:32 +0000
Subject: changeset in /hg/icedtea6: Add IcedTea version to java -version.
In-Reply-To: <20081107131805.GD4439@redhat.com>
References: <hg.829a4250db62.1224088341.2873452341184383832@icedtea.classpath.org>
	<20081107131805.GD4439@redhat.com>
Message-ID: <17c6771e0811070608l26467c7ai3c122b43b0f0b306@mail.gmail.com>

2008/11/7 Gary Benson <gbenson at redhat.com>:
> Andrew John Hughes wrote:
>> changeset 829a4250db62 in /hg/icedtea6
>> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=829a4250db62
>> description:
>>       Add IcedTea version to java -version.
> [snip]
>> +     if [ -e $(abs_top_srcdir)/.hg ]; then \
>> +       revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
>> +     fi ; \
>> +     icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
>> +     sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
>
> The number reported by '{rev}' is only meaningful within your own
> repository.  Anyone mind if I change this to '{node|short}'?
>
> Cheers,
> Gary
>
> --
> http://gbenson.net/
>

Well the idea was that these would be the revision numbers of the
IcedTea6 and IcedTea7 repositories, in the same vein as the Subversion
numbers used by gcc.  Do they break in some awful way with Mercurial?
I can see there are issues if you have your own repository with lots
of local commits but the intention was for them to be used against the
main repositories.

My only objection against using the node number instead is that there
then isn't a logical progression between revisions.  One of the
benefits of using rev is that it's clear that one revision is later
than another for the same repository.  But if this makes it a lot
easier to match up a build with a source tree, go for it.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gbenson at redhat.com  Fri Nov  7 06:18:05 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 7 Nov 2008 14:18:05 +0000
Subject: changeset in /hg/icedtea6: Add IcedTea version to java -version.
In-Reply-To: <17c6771e0811070608l26467c7ai3c122b43b0f0b306@mail.gmail.com>
References: <hg.829a4250db62.1224088341.2873452341184383832@icedtea.classpath.org>
	<20081107131805.GD4439@redhat.com>
	<17c6771e0811070608l26467c7ai3c122b43b0f0b306@mail.gmail.com>
Message-ID: <20081107141801.GE4439@redhat.com>

Andrew John Hughes wrote:
> 2008/11/7 Gary Benson <gbenson at redhat.com>:
> > Andrew John Hughes wrote:
> > > changeset 829a4250db62 in /hg/icedtea6
> > > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=829a4250db62
> > > description:
> > >       Add IcedTea version to java -version.
> > [snip]
> > > +     if [ -e $(abs_top_srcdir)/.hg ]; then \
> > > +       revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
> > > +     fi ; \
> > > +     icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
> > > +     sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
> >
> > The number reported by '{rev}' is only meaningful within your own
> > repository.  Anyone mind if I change this to '{node|short}'?
> 
> Well the idea was that these would be the revision numbers of the
> IcedTea6 and IcedTea7 repositories, in the same vein as the
> Subversion numbers used by gcc.  Do they break in some awful way
> with Mercurial?  I can see there are issues if you have your own
> repository with lots of local commits but the intention was for them
> to be used against the main repositories.

I'm not 100% sure but I think the revision numbers are in date order,
so if someone pushes a bunch of branch commits that interleave with
the main trunk then the numbers will change.

Cheers,
Gary

-- 
http://gbenson.net/


From mark at klomp.org  Fri Nov  7 06:33:55 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 07 Nov 2008 15:33:55 +0100
Subject: changeset in /hg/icedtea6: Add IcedTea version to java -version.
In-Reply-To: <20081107141801.GE4439@redhat.com>
References: <hg.829a4250db62.1224088341.2873452341184383832@icedtea.classpath.org>
	<20081107131805.GD4439@redhat.com>
	<17c6771e0811070608l26467c7ai3c122b43b0f0b306@mail.gmail.com>
	<20081107141801.GE4439@redhat.com>
Message-ID: <1226068435.3310.27.camel@dijkstra.wildebeest.org>

On Fri, 2008-11-07 at 14:18 +0000, Gary Benson wrote:
> Andrew John Hughes wrote:
> > 2008/11/7 Gary Benson <gbenson at redhat.com>:
> > > Andrew John Hughes wrote:
> > > > changeset 829a4250db62 in /hg/icedtea6
> > > > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=829a4250db62
> > > > description:
> > > >       Add IcedTea version to java -version.
> > > [snip]
> > > > +     if [ -e $(abs_top_srcdir)/.hg ]; then \
> > > > +       revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
> > > > +     fi ; \
> > > > +     icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
> > > > +     sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
> > >
> > > The number reported by '{rev}' is only meaningful within your own
> > > repository.  Anyone mind if I change this to '{node|short}'?
> > 
> > Well the idea was that these would be the revision numbers of the
> > IcedTea6 and IcedTea7 repositories, in the same vein as the
> > Subversion numbers used by gcc.  Do they break in some awful way
> > with Mercurial?  I can see there are issues if you have your own
> > repository with lots of local commits but the intention was for them
> > to be used against the main repositories.
> 
> I'm not 100% sure but I think the revision numbers are in date order,
> so if someone pushes a bunch of branch commits that interleave with
> the main trunk then the numbers will change.

Yes, in date order of when they got into your local tree. For example we
just crossed commits and rev 1191 for me is on one box:

changeset:   1191:bddf55be4f36
user:        Gary Benson <gbenson at redhat.com>
date:        Fri Nov 07 06:50:49 2008 -0500
summary:     2008-11-07  Gary Benson  <gbenson at redhat.com>

But on another box it is:

changeset:   1191:7175ea5857e4
parent:      1166:5176cf42d236
user:        Mark Wielaard <mark at klomp.org>
date:        Fri Nov 07 13:47:41 2008 +0100
summary:     * patches/icedtea-6761856-freetypescaler.patch: New patch.

So I would say please use '{node|sort}' to make sure they are unique.
(And if 12 hex-digits are still too long, you can probably get away with
just the first 6 with | cut -c-6 and still have unique numbers that you
can feed into all hg commands that take a revision - totally
unscientificly determined by a quick look through my local repos).

Cheers,

Mark



From gnu_andrew at member.fsf.org  Fri Nov  7 06:49:27 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 7 Nov 2008 14:49:27 +0000
Subject: changeset in /hg/icedtea6: Add IcedTea version to java -version.
In-Reply-To: <1226068435.3310.27.camel@dijkstra.wildebeest.org>
References: <hg.829a4250db62.1224088341.2873452341184383832@icedtea.classpath.org>
	<20081107131805.GD4439@redhat.com>
	<17c6771e0811070608l26467c7ai3c122b43b0f0b306@mail.gmail.com>
	<20081107141801.GE4439@redhat.com>
	<1226068435.3310.27.camel@dijkstra.wildebeest.org>
Message-ID: <17c6771e0811070649h71280a2aoa2f5feb76f2b368b@mail.gmail.com>

2008/11/7 Mark Wielaard <mark at klomp.org>:
> On Fri, 2008-11-07 at 14:18 +0000, Gary Benson wrote:
>> Andrew John Hughes wrote:
>> > 2008/11/7 Gary Benson <gbenson at redhat.com>:
>> > > Andrew John Hughes wrote:
>> > > > changeset 829a4250db62 in /hg/icedtea6
>> > > > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=829a4250db62
>> > > > description:
>> > > >       Add IcedTea version to java -version.
>> > > [snip]
>> > > > +     if [ -e $(abs_top_srcdir)/.hg ]; then \
>> > > > +       revision="-r`(cd $(srcdir); $(HG) tip --template '{rev}')`" ; \
>> > > > +     fi ; \
>> > > > +     icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
>> > > > +     sed -i "s#IcedTea6#IcedTea6 $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk
>> > >
>> > > The number reported by '{rev}' is only meaningful within your own
>> > > repository.  Anyone mind if I change this to '{node|short}'?
>> >
>> > Well the idea was that these would be the revision numbers of the
>> > IcedTea6 and IcedTea7 repositories, in the same vein as the
>> > Subversion numbers used by gcc.  Do they break in some awful way
>> > with Mercurial?  I can see there are issues if you have your own
>> > repository with lots of local commits but the intention was for them
>> > to be used against the main repositories.
>>
>> I'm not 100% sure but I think the revision numbers are in date order,
>> so if someone pushes a bunch of branch commits that interleave with
>> the main trunk then the numbers will change.
>
> Yes, in date order of when they got into your local tree. For example we
> just crossed commits and rev 1191 for me is on one box:
>
> changeset:   1191:bddf55be4f36
> user:        Gary Benson <gbenson at redhat.com>
> date:        Fri Nov 07 06:50:49 2008 -0500
> summary:     2008-11-07  Gary Benson  <gbenson at redhat.com>
>
> But on another box it is:
>
> changeset:   1191:7175ea5857e4
> parent:      1166:5176cf42d236
> user:        Mark Wielaard <mark at klomp.org>
> date:        Fri Nov 07 13:47:41 2008 +0100
> summary:     * patches/icedtea-6761856-freetypescaler.patch: New patch.
>
> So I would say please use '{node|sort}' to make sure they are unique.
> (And if 12 hex-digits are still too long, you can probably get away with
> just the first 6 with | cut -c-6 and still have unique numbers that you
> can feed into all hg commands that take a revision - totally
> unscientificly determined by a quick look through my local repos).
>
> Cheers,
>
> Mark
>
>

Ok, fixed.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gnu_andrew at member.fsf.org  Fri Nov  7 06:51:03 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 07 Nov 2008 14:51:03 +0000
Subject: changeset in /hg/icedtea6: Merge.
Message-ID: <hg.df4bef3a43ee.1226069463.2873452341184383832@icedtea.classpath.org>

changeset df4bef3a43ee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=df4bef3a43ee
description:
	Merge.

diffstat:

4 files changed, 59 insertions(+), 4 deletions(-)
ChangeLog                      |   18 +++++++++++++++++-
Makefile.am                    |    7 +++++--
acinclude.m4                   |   12 +++++++++++-
patches/icedtea-ecj-jopt.patch |   26 ++++++++++++++++++++++++++

diffs (121 lines):

diff -r 26c630b5f91d -r df4bef3a43ee ChangeLog
--- a/ChangeLog	Fri Nov 07 14:48:58 2008 +0000
+++ b/ChangeLog	Fri Nov 07 14:50:55 2008 +0000
@@ -2,7 +2,21 @@ 2008-11-07  Andrew John Hughes  <ahughes
 
 	* Makefile.am: Use 'node|short' instead of 'rev'
 	for Mercurial revision number.
-	
+
+2008-10-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add bootstrap-directory-symlink
+	target to icedtea-ecj so it works as the user-specified
+	make target.
+
+2008-10-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Pass JAR_KNOWS_J_OPTIONS	to ecj make.
+	* acinclude.m4: Check whether or not jar supports -J
+	options at the end.
+	* patches/icedtea-ecj-jopt.patch: Only add -J options
+	to jar in JDK and CORBA when supported.
+
 2008-10-29  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-6761856-freetypescaler.patch: New patch.
@@ -168,6 +182,8 @@ 2008-10-31  Lillian Angel  <langel at redha
 	* Makefile.am: Updated for new visualvm 1.0.1.
 	* patches/icedtea-visualvm.patch: Updated.
 
+=======
+>>>>>>> other
 2008-10-29  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/238:
diff -r 26c630b5f91d -r df4bef3a43ee Makefile.am
--- a/Makefile.am	Fri Nov 07 14:48:58 2008 +0000
+++ b/Makefile.am	Fri Nov 07 14:50:55 2008 +0000
@@ -247,6 +247,7 @@ ICEDTEA_ENV_ECJ = \
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
 	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
+	"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
 	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
 
 if WITH_CACAO
@@ -771,7 +772,8 @@ stamps/ports-ecj.stamp: stamps/extract-e
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
-	patches/icedtea-ecj-spp.patch
+	patches/icedtea-ecj-spp.patch \
+	patches/icedtea-ecj-jopt.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	mkdir -p stamps; \
@@ -1118,7 +1120,8 @@ stamps/native-ecj.stamp:
 	fi ; \
 	touch stamps/native-ecj.stamp
 
-stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
diff -r 26c630b5f91d -r df4bef3a43ee acinclude.m4
--- a/acinclude.m4	Fri Nov 07 14:48:58 2008 +0000
+++ b/acinclude.m4	Fri Nov 07 14:50:55 2008 +0000
@@ -351,10 +351,20 @@ EOF
     JAR_ACCEPTS_STDIN_LIST=
     AC_MSG_RESULT(no)
   fi
-  rm -f _config.txt _config.list _config.jar
+  rm -f _config.list _config.jar
+  AC_MSG_CHECKING([whether jar supports -J options at the end])
+  if $JAR cf _config.jar _config.txt -J-Xmx896m 2>/dev/null; then
+    JAR_KNOWS_J_OPTIONS=1
+    AC_MSG_RESULT(yes)
+  else
+    JAR_KNOWS_J_OPTIONS=
+    AC_MSG_RESULT(no)
+  fi
+  rm -f _config.txt _config.jar
   AC_SUBST(JAR)
   AC_SUBST(JAR_KNOWS_ATFILE)
   AC_SUBST(JAR_ACCEPTS_STDIN_LIST)
+  AC_SUBST(JAR_KNOWS_J_OPTIONS)
 ])
 
 AC_DEFUN([FIND_RMIC],
diff -r 26c630b5f91d -r df4bef3a43ee patches/icedtea-ecj-jopt.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ecj-jopt.patch	Fri Nov 07 14:50:55 2008 +0000
@@ -0,0 +1,26 @@
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:45:43.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:49:29.000000000 +0100
+@@ -75,7 +75,9 @@
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+ 
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ #    langtools is not available.
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:14:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:15:00.000000000 +0100
+@@ -82,7 +82,9 @@
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+ 
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ #    langtools is not available.


From ahughes at redhat.com  Fri Nov  7 06:51:02 2008
From: ahughes at redhat.com (Andrew John Hughes)
Date: Fri, 07 Nov 2008 14:51:02 +0000
Subject: changeset in /hg/icedtea6: Couple of bug fixes.
Message-ID: <hg.3331656afb5a.1226069462.2873452341184383832@icedtea.classpath.org>

changeset 3331656afb5a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3331656afb5a
description:
	Couple of bug fixes.

	2008-10-30  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Add bootstrap-directory-symlink
		target to icedtea-ecj so it works as the user-specified
		make target.

	2008-10-22  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Pass JAR_KNOWS_J_OPTIONS	to ecj make.
		* acinclude.m4: Check whether or not jar supports -J
		options at the end.
		* patches/icedtea-ecj-jopt.patch: Only add -J options
		to jar in JDK and CORBA when supported.

diffstat:

4 files changed, 56 insertions(+), 3 deletions(-)
ChangeLog                      |   14 ++++++++++++++
Makefile.am                    |    7 +++++--
acinclude.m4                   |   12 +++++++++++-
patches/icedtea-ecj-jopt.patch |   26 ++++++++++++++++++++++++++

diffs (107 lines):

diff -r 5176cf42d236 -r 3331656afb5a ChangeLog
--- a/ChangeLog	Wed Oct 29 11:29:20 2008 -0400
+++ b/ChangeLog	Sat Nov 01 03:39:24 2008 +0000
@@ -1,3 +1,17 @@ 2008-10-29  Gary Benson  <gbenson at redhat
+2008-10-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add bootstrap-directory-symlink
+	target to icedtea-ecj so it works as the user-specified
+	make target.
+	
+2008-10-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Pass JAR_KNOWS_J_OPTIONS	to ecj make.
+	* acinclude.m4: Check whether or not jar supports -J
+	options at the end.
+	* patches/icedtea-ecj-jopt.patch: Only add -J options
+	to jar in JDK and CORBA when supported.
+
 2008-10-29  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/238:
diff -r 5176cf42d236 -r 3331656afb5a Makefile.am
--- a/Makefile.am	Wed Oct 29 11:29:20 2008 -0400
+++ b/Makefile.am	Sat Nov 01 03:39:24 2008 +0000
@@ -247,6 +247,7 @@ ICEDTEA_ENV_ECJ = \
 	"JAVAC=" \
 	"RHINO_JAR=$(RHINO_JAR)" \
 	"JAR_KNOWS_ATFILE=$(JAR_KNOWS_ATFILE)" \
+	"JAR_KNOWS_J_OPTIONS=$(JAR_KNOWS_J_OPTIONS)" \
 	"JAR_ACCEPTS_STDIN_LIST=$(JAR_ACCEPTS_STDIN_LIST)"
 
 if WITH_CACAO
@@ -766,7 +767,8 @@ stamps/ports-ecj.stamp: stamps/extract-e
 
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
-	patches/icedtea-ecj-spp.patch
+	patches/icedtea-ecj-spp.patch \
+	patches/icedtea-ecj-jopt.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	mkdir -p stamps; \
@@ -1113,7 +1115,8 @@ stamps/native-ecj.stamp:
 	fi ; \
 	touch stamps/native-ecj.stamp
 
-stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
diff -r 5176cf42d236 -r 3331656afb5a acinclude.m4
--- a/acinclude.m4	Wed Oct 29 11:29:20 2008 -0400
+++ b/acinclude.m4	Sat Nov 01 03:39:24 2008 +0000
@@ -351,10 +351,20 @@ EOF
     JAR_ACCEPTS_STDIN_LIST=
     AC_MSG_RESULT(no)
   fi
-  rm -f _config.txt _config.list _config.jar
+  rm -f _config.list _config.jar
+  AC_MSG_CHECKING([whether jar supports -J options at the end])
+  if $JAR cf _config.jar _config.txt -J-Xmx896m 2>/dev/null; then
+    JAR_KNOWS_J_OPTIONS=1
+    AC_MSG_RESULT(yes)
+  else
+    JAR_KNOWS_J_OPTIONS=
+    AC_MSG_RESULT(no)
+  fi
+  rm -f _config.txt _config.jar
   AC_SUBST(JAR)
   AC_SUBST(JAR_KNOWS_ATFILE)
   AC_SUBST(JAR_ACCEPTS_STDIN_LIST)
+  AC_SUBST(JAR_KNOWS_J_OPTIONS)
 ])
 
 AC_DEFUN([FIND_RMIC],
diff -r 5176cf42d236 -r 3331656afb5a patches/icedtea-ecj-jopt.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ecj-jopt.patch	Sat Nov 01 03:39:24 2008 +0000
@@ -0,0 +1,26 @@
+diff -Nru openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk openjdk-ecj/corba/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:45:43.000000000 +0100
++++ openjdk-ecj/corba/make/common/shared/Defs-java.gmk	2008-10-22 18:49:29.000000000 +0100
+@@ -75,7 +75,9 @@
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+ 
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ #    langtools is not available.
+diff -Nru openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk openjdk-ecj/jdk/make/common/shared/Defs-java.gmk
+--- openjdk-ecj.orig/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:14:30.000000000 +0100
++++ openjdk-ecj/jdk/make/common/shared/Defs-java.gmk	2008-10-22 19:15:00.000000000 +0100
+@@ -82,7 +82,9 @@
+ JAVAC_JVM_FLAGS    += $(JAVA_TOOLS_FLAGS:%=-J%)
+ 
+ # The jar -J options are special, must be added at the end of the command line
++ifneq (,$(JAR_KNOWS_J_OPTIONS))
+ JAR_JFLAGS       = $(JAVA_TOOLS_FLAGS:%=-J%)
++endif
+ 
+ # JAVA_TOOLS_DIR is the default location to find Java tools to run, if
+ #    langtools is not available.


From gnu_andrew at member.fsf.org  Fri Nov  7 06:51:03 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 07 Nov 2008 14:51:03 +0000
Subject: changeset in /hg/icedtea6: Use node|short instead of rev.
Message-ID: <hg.26c630b5f91d.1226069463.2873452341184383832@icedtea.classpath.org>

changeset 26c630b5f91d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=26c630b5f91d
description:
	Use node|short instead of rev.

	2008-11-07  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Use 'node|short' instead of 'rev'
		for Mercurial revision number.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-

diffs (24 lines):

diff -r cb1f68e8019a -r 26c630b5f91d ChangeLog
--- a/ChangeLog	Fri Nov 07 13:54:54 2008 +0100
+++ b/ChangeLog	Fri Nov 07 14:48:58 2008 +0000
@@ -1,3 +1,8 @@ 2008-10-29  Mark Wielaard  <mark at klomp.o
+2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Use 'node|short' instead of 'rev'
+	for Mercurial revision number.
+	
 2008-10-29  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-6761856-freetypescaler.patch: New patch.
diff -r cb1f68e8019a -r 26c630b5f91d Makefile.am
--- a/Makefile.am	Fri Nov 07 13:54:54 2008 +0100
+++ b/Makefile.am	Fri Nov 07 14:48:58 2008 +0000
@@ -642,7 +642,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	fi
 
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
-	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
+	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{node|short}')`" ; \
 	fi ; \
 	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
 	if [ -n "$(PKGVERSION)" ]; then \


From gnu_andrew at member.fsf.org  Fri Nov  7 07:39:01 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 07 Nov 2008 15:39:01 +0000
Subject: changeset in /hg/icedtea: Make Zero build on IcedTea7 again.
Message-ID: <hg.abc8a694096f.1226072341.-6899778133799504387@icedtea.classpath.org>

changeset abc8a694096f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=abc8a694096f
description:
	Make Zero build on IcedTea7 again.

	2008-11-07  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Remove unneeded citypeflow fix,
		move zero patching to the end.
		* patches/icedtea-bytecodeInterpreter.patch,
		* patches/icedtea-hotspot7-build-fixes.patch:
		Regenerated.
		* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
		* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
		* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
		Updated for HotSpot 14 b05.

	2008-10-30  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Add bootstrap-directory-symlink
		target to icedtea-ecj so it works as the user-specified
		make target.

diffstat:

9 files changed, 50 insertions(+), 52 deletions(-)
ChangeLog                                           |   20 ++++++++++++
Makefile.am                                         |   17 ++++------
patches/icedtea-bytecodeInterpreter.patch           |   31 +------------------
patches/icedtea-hotspot7-build-fixes.patch          |    4 +-
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp    |    2 -
ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp |    1 
ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp |   17 ++++------
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp        |    2 -
ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp    |    8 ++++

diffs (221 lines):

diff -r c3e121763e20 -r abc8a694096f ChangeLog
--- a/ChangeLog	Wed Oct 29 18:29:19 2008 +0000
+++ b/ChangeLog	Fri Nov 07 15:38:49 2008 +0000
@@ -1,3 +1,23 @@ 2008-10-29  Andrew John Hughes  <ahughes
+2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Remove unneeded citypeflow fix,
+	move zero patching to the end.
+	* patches/icedtea-bytecodeInterpreter.patch,
+	* patches/icedtea-hotspot7-build-fixes.patch:
+	Regenerated.
+	* ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp,
+	* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
+	* ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp:
+	Updated for HotSpot 14 b05.
+
+2008-10-30  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add bootstrap-directory-symlink
+	target to icedtea-ecj so it works as the user-specified
+	make target.
+
 2008-10-29  Andrew John Hughes  <ahughes at redhat.com>
 
 	Merge from IcedTea6 1.3.1.
diff -r c3e121763e20 -r abc8a694096f Makefile.am
--- a/Makefile.am	Wed Oct 29 18:29:19 2008 +0000
+++ b/Makefile.am	Fri Nov 07 15:38:49 2008 +0000
@@ -499,8 +499,7 @@ ZERO_PATCHES = \
 	patches/icedtea-signature-iterator.patch \
 	patches/icedtea-test-atomic-operations.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-ia64-bugfix.patch \
-	patches/icedtea-hotspot-citypeflow.patch
+	patches/icedtea-ia64-bugfix.patch 
 
 # Patches needed when not using the newer OpenJDK 7 HotSpot for zero.
 NON_ZERO_PATCHES = 
@@ -523,7 +522,6 @@ ICEDTEA_FSG_PATCHES = \
 	patches/icedtea-jscheme.patch
 
 ICEDTEA_PATCHES = \
-	$(ZERO_PATCHES_COND) \
 	patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
 	patches/icedtea-text-relocations.patch \
@@ -561,7 +559,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-sparc-ptracefix.patch \
 	patches/icedtea-sparc-trapsfix.patch \
 	patches/icedtea-override-redirect-metacity.patch \
-	$(ZERO_PATCHES_COND) \
 	patches/icedtea-no-bcopy.patch \
 	patches/icedtea-shark-build.patch \
 	patches/icedtea-toolkit.patch \
@@ -586,7 +583,8 @@ ICEDTEA_PATCHES = \
 	$(VISUALVM_PATCH) \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
-	patches/icedtea-renderer-crossing.patch
+	patches/icedtea-renderer-crossing.patch \
+	$(ZERO_PATCHES_COND)
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -827,7 +825,7 @@ stamps/native-ecj.stamp: stamps/patch.st
 	fi ; \
 	touch stamps/native-ecj.stamp
 
-stamps/overlay.stamp: stamps/native-ecj.stamp
+stamps/overlay.stamp: 
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
 	fi ; \
@@ -1239,7 +1237,8 @@ stamps/native-ecj.stamp:
 	fi ; \
 	touch stamps/native-ecj.stamp
 
-stamps/icedtea-ecj.stamp: stamps/hotspot-tools.stamp stamps/plugs.stamp \
+stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
+	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports-ecj.stamp stamps/patch-ecj.stamp stamps/cacao.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
@@ -1273,9 +1272,7 @@ clean-icedtea-ecj: stamps/clone-ecj.stam
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj clobber
 
-stamps/icedtea-against-ecj.stamp: \
-	stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/icedtea-ecj.stamp
+stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-ecj.stamp
 
diff -r c3e121763e20 -r abc8a694096f patches/icedtea-bytecodeInterpreter.patch
--- a/patches/icedtea-bytecodeInterpreter.patch	Wed Oct 29 18:29:19 2008 +0000
+++ b/patches/icedtea-bytecodeInterpreter.patch	Fri Nov 07 15:38:49 2008 +0000
@@ -1,6 +1,6 @@ diff -r b3238230c1ef openjdk/hotspot/src
-diff -r b3238230c1ef openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:14:32 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	Fri Nov 02 10:15:45 2007 +0000
+diff -Nru openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp
+--- openjdk.orig/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-10-23 08:41:04.000000000 +0100
++++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.hpp	2008-10-30 15:48:48.000000000 +0000
 @@ -60,7 +60,6 @@
  };
  
@@ -9,28 +9,3 @@ diff -r b3238230c1ef openjdk/hotspot/src
  friend class AbstractInterpreterGenerator;
  friend class CppInterpreterGenerator;
  friend class InterpreterGenerator;
-diff -r bae119bcbcd0 openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp
---- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:08:47 2007 +0000
-+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp	Fri Nov 02 15:21:08 2007 +0000
-@@ -518,16 +518,16 @@
- 
- /* 0xC0 */ &&opc_checkcast,   &&opc_instanceof,     &&opc_monitorenter, &&opc_monitorexit,
- /* 0xC4 */ &&opc_wide,        &&opc_multianewarray, &&opc_ifnull,       &&opc_ifnonnull,
--/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_fast_igetfield,
--/* 0xCC */ &&opc_fastagetfield,&&opc_fast_aload_0,  &&opc_fast_iaccess_0, &&opc__fast_aaccess_0,
--
--/* 0xD0 */ &&opc_fast_linearswitch, &&opc_fast_binaryswitch, &&opc_return_register_finalizer,      &&opc_default,
-+/* 0xC8 */ &&opc_goto_w,      &&opc_jsr_w,          &&opc_breakpoint,   &&opc_default,
-+/* 0xCC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
-+
-+/* 0xD0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xD4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xD8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xDC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- 
- /* 0xE0 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
--/* 0xE4 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
-+/* 0xE4 */ &&opc_default,     &&opc_return_register_finalizer, &&opc_default, &&opc_default,
- /* 0xE8 */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- /* 0xEC */ &&opc_default,     &&opc_default,        &&opc_default,      &&opc_default,
- 
diff -r c3e121763e20 -r abc8a694096f patches/icedtea-hotspot7-build-fixes.patch
--- a/patches/icedtea-hotspot7-build-fixes.patch	Wed Oct 29 18:29:19 2008 +0000
+++ b/patches/icedtea-hotspot7-build-fixes.patch	Fri Nov 07 15:38:49 2008 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/src/share
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp openjdk/hotspot/src/share/vm/runtime/vm_version.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2008-05-27 22:41:12.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-05-28 11:58:57.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/runtime/vm_version.cpp	2008-10-30 17:10:16.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/vm_version.cpp	2008-10-30 17:11:34.000000000 +0000
 @@ -88,9 +88,6 @@
    #define VMLP ""
  #endif
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp	Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp	Fri Nov 07 15:38:49 2008 +0000
@@ -44,7 +44,7 @@ class MacroAssembler : public Assembler 
 
   void align(int modulus);
   void bang_stack_with_offset(int offset);
-
+  bool needs_explicit_null_check(intptr_t offset);
  public:
   void advance(int bytes);
 };
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp	Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp	Fri Nov 07 15:38:49 2008 +0000
@@ -47,3 +47,4 @@ void Disassembler::decode(u_char *begin,
   Unimplemented();
 }
 #endif // PRODUCT
+
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.hpp	Fri Nov 07 15:38:49 2008 +0000
@@ -26,13 +26,10 @@
 // The disassembler prints out zero code annotated
 // with Java specific information.
 
-class Disassembler
-{
- public:
-  static void decode(CodeBlob *cb, outputStream *st = NULL)
-    PRODUCT_RETURN;
-  static void decode(nmethod *nm, outputStream *st = NULL)
-    PRODUCT_RETURN;
-  static void decode(u_char *begin, u_char *end, outputStream *st = NULL)
-    PRODUCT_RETURN;
-};
+  static int pd_instruction_alignment() {
+    Unimplemented();
+  }
+
+  static const char* pd_cpu_opts() {
+    Unimplemented();
+  }
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/frame_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/frame_zero.cpp	Fri Nov 07 15:38:49 2008 +0000
@@ -125,7 +125,7 @@ void frame::pd_gc_epilog()
 {
 }
 
-bool frame::is_interpreted_frame_valid() const
+bool frame::is_interpreted_frame_valid(JavaThread *thread) const
 {
   Unimplemented();
 }
diff -r c3e121763e20 -r abc8a694096f ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Wed Oct 29 18:29:19 2008 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/relocInfo_zero.cpp	Fri Nov 07 15:38:49 2008 +0000
@@ -66,3 +66,11 @@ void Relocation::pd_swap_out_breakpoint(
 {
   Unimplemented();
 }
+
+void poll_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer *dest) {
+  Unimplemented();
+}
+
+void poll_return_Relocation::fix_relocation_after_move(const CodeBuffer* src, CodeBuffer* dest) {
+  Unimplemented();
+}


From gnu_andrew at member.fsf.org  Fri Nov  7 07:44:11 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 07 Nov 2008 15:44:11 +0000
Subject: changeset in /hg/icedtea: Change rev to node|short for Mercurial...
Message-ID: <hg.c6ae181e1021.1226072651.-6899778133799504387@icedtea.classpath.org>

changeset c6ae181e1021 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c6ae181e1021
description:
	Change rev to node|short for Mercurial revisions.

	2008-11-07  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Use 'node|short' instead of 'rev'
		for Mercurial revision number.

diffstat:

2 files changed, 6 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-

diffs (24 lines):

diff -r abc8a694096f -r c6ae181e1021 ChangeLog
--- a/ChangeLog	Fri Nov 07 15:38:49 2008 +0000
+++ b/ChangeLog	Fri Nov 07 15:44:03 2008 +0000
@@ -1,3 +1,8 @@ 2008-11-07  Andrew John Hughes  <ahughes
+2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Use 'node|short' instead of 'rev'
+	for Mercurial revision number.
+
 2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Remove unneeded citypeflow fix,
diff -r abc8a694096f -r c6ae181e1021 Makefile.am
--- a/Makefile.am	Fri Nov 07 15:38:49 2008 +0000
+++ b/Makefile.am	Fri Nov 07 15:44:03 2008 +0000
@@ -718,7 +718,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	fi
 
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
-	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
+	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{node|short}')`" ; \
 	fi ; \
 	icedtea_version="$(PACKAGE_VERSION)$${revision}" ; \
 	if [ -n "$(PKGVERSION)" ]; then \


From gnu_andrew at member.fsf.org  Fri Nov  7 07:53:54 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 07 Nov 2008 15:53:54 +0000
Subject: changeset in /hg/icedtea6: Remove merge detritus.
Message-ID: <hg.b259b240929b.1226073234.2873452341184383832@icedtea.classpath.org>

changeset b259b240929b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b259b240929b
description:
	Remove merge detritus.

diffstat:

1 file changed, 2 deletions(-)
ChangeLog |    2 --

diffs (12 lines):

diff -r df4bef3a43ee -r b259b240929b ChangeLog
--- a/ChangeLog	Fri Nov 07 14:50:55 2008 +0000
+++ b/ChangeLog	Fri Nov 07 15:53:48 2008 +0000
@@ -182,8 +182,6 @@ 2008-10-31  Lillian Angel  <langel at redha
 	* Makefile.am: Updated for new visualvm 1.0.1.
 	* patches/icedtea-visualvm.patch: Updated.
 
-=======
->>>>>>> other
 2008-10-29  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/238:


From Igor.Nekrestyanov at Sun.COM  Fri Nov  7 06:10:14 2008
From: Igor.Nekrestyanov at Sun.COM (Igor Nekrestyanov)
Date: Fri, 07 Nov 2008 17:10:14 +0300
Subject: [OpenJDK 2D-Dev] <AWT Dev>   Bad component spacing
In-Reply-To: <1226063147.3310.12.camel@dijkstra.wildebeest.org>
References: <4912D242.1010404@sun.com> <4912E2AF.6090708@sun.com>
	<49132DBC.5080106@sun.com>
	<1226063147.3310.12.camel@dijkstra.wildebeest.org>
Message-ID: <49144C46.9090303@sun.com>

Thank you Mark!

i keep forgetting that bug database is not available to everyone yet :(

-igor

Mark Wielaard wrote:
> Hi,
>
> On Thu, 2008-11-06 at 20:47 +0300, Igor Nekrestyanov wrote:
>   
>> This is likely to be same as
>>   http://monaco.sfbay.sun.com/detail.jsf?cr=6761856
>> that was recently fixed and did not make it into main openjdk ws yet but 
>> you can pull these changes from 2D workspace to test.
>>     
>
> For those in the community without access to internal sun machines this
> is: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6761856
> and: http://hg.openjdk.java.net/jdk7/2d-gate/jdk/rev/9cdababf6179
>
> This was also reported against IcedTea as:
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=227
>
> I have imported the patch into IcedTea6 and tested that it fixes the
> mentioned issues:
>
> 2008-10-29  Mark Wielaard  <mark at klomp.org>
>
>    * patches/icedtea-6761856-freetypescaler.patch: New patch.
>    * Makefile.am (ICEDTEA_PATCHES): Add new patch.
>    * HACKING: Document new patch.
>
> Cheers,
>
> Mark
>
>   



From bugzilla-daemon at icedtea.classpath.org  Fri Nov  7 10:40:31 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 07 Nov 2008 18:40:31 +0000
Subject: [Bug 251] New: ubuntu 8.04 amd64 - Java applet loop: openjdk-6
	icedtea6-plugin Firefox
Message-ID: <E1KyWFz-0003oQ-8A@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=251

           Summary: ubuntu 8.04 amd64 - Java applet loop: openjdk-6
                    icedtea6-plugin Firefox
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: edantes at usa.com


Environment:

Ubuntu 8.10 amd64,
Firefox 3.0.3+nobinonly-0ubuntu2
IcedTea6-plugin 6b12-0ubuntu6
openjdk-6-jre6 b12-0ubuntu6

Description:
Banco do Brasil online banking system uses an applet with a virtual 
keyboard for users to enter their passwords. This applet starts and 
displays correctly with my setup, until I try send the entered 
password. Firefox goes into loop.

You don't need an account nor knowledge of Portuguese to try it out. Go
to this address:

https://www2.bancobrasil.com.br/aapf...p?aapf.IDH=sim

1. Enter a mock password by clicking on the numbers under "Teclado
virtual"

2. Press the "Entrar" button.

3.  Firefox has to be restarted to exit the loop

The message in Firefox error log is

Error: Permission denied to get property XULElement.disabled
Source File: https://www2.bancobrasil.com.br/aapf/includes/js/aapf.js
Line: 421


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From omajid at redhat.com  Fri Nov  7 13:34:56 2008
From: omajid at redhat.com (Omair Majid)
Date: Fri, 07 Nov 2008 21:34:56 +0000
Subject: changeset in /hg/icedtea: 2008-11-07  Omair Majid  <omajid@redha...
Message-ID: <hg.e61d84115155.1226093696.-6899778133799504387@icedtea.classpath.org>

changeset e61d84115155 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e61d84115155
description:
	2008-11-07  Omair Majid  <omajid at redhat.com>

	    * patches/icedtea-jsoundhs.patch: Added two more diffs to remove all uses
	    of jsoundhs and Headspace libraries.

diffstat:

2 files changed, 33 insertions(+)
ChangeLog                      |    5 +++++
patches/icedtea-jsoundhs.patch |   28 ++++++++++++++++++++++++++++

diffs (47 lines):

diff -r c6ae181e1021 -r e61d84115155 ChangeLog
--- a/ChangeLog	Fri Nov 07 15:44:03 2008 +0000
+++ b/ChangeLog	Fri Nov 07 16:31:49 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-07  Andrew John Hughes  <ahughes
+2008-11-07  Omair Majid  <omajid at redhat.com>
+
+	* patches/icedtea-jsoundhs.patch: Added two more diffs to remove all uses 
+	of jsoundhs and Headspace libraries.
+
 2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Use 'node|short' instead of 'rev'
diff -r c6ae181e1021 -r e61d84115155 patches/icedtea-jsoundhs.patch
--- a/patches/icedtea-jsoundhs.patch	Fri Nov 07 15:44:03 2008 +0000
+++ b/patches/icedtea-jsoundhs.patch	Fri Nov 07 16:31:49 2008 -0500
@@ -51,3 +51,31 @@ diff -Nru openjdk.orig/jdk/make/javax/so
  # system dependent flags
  #
  ifeq ($(PLATFORM), windows)
+diff -uNr openjdk-orig/jdk/src/share/classes/com/sun/media/sound/Platform.java openjdk/jdk/src/share/classes/com/sun/media/sound/Platform.java
+--- openjdk-orig/jdk/src/share/classes/com/sun/media/sound/Platform.java	2008-11-07 10:38:15.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/Platform.java	2008-11-07 10:43:21.000000000 -0500
+@@ -42,7 +42,6 @@
+ 
+     // native library we need to load
+     private static final String libNameMain     = "jsound";
+-    private static final String libNameMain2    = "jsoundhs";
+ 
+     private static final String libNameALSA     = "jsoundalsa";
+     private static final String libNameDSound   = "jsoundds";
+@@ -160,7 +159,6 @@
+         try {
+             // load the main libraries
+             JSSecurityManager.loadLibrary(libNameMain);
+-            JSSecurityManager.loadLibrary(libNameMain2);
+             // just for the heck of it...
+             loadedLibs |= LIB_MAIN;
+         } catch (SecurityException e) {
+diff -uNr openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
+--- openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:38:15.000000000 -0500
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:43:38.000000000 -0500
+@@ -1,5 +1,4 @@
+ # last mixer is default mixer
+ com.sun.media.sound.PortMixerProvider
+ com.sun.media.sound.SimpleInputDeviceProvider
+-com.sun.media.sound.HeadspaceMixerProvider
+ com.sun.media.sound.DirectAudioDeviceProvider


From mark at klomp.org  Sat Nov  8 02:47:21 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 10:47:21 +0000
Subject: changeset in /hg/icedtea6: Integrate b13 drop fixes.
Message-ID: <hg.e58c66c7c2ee.1226141241.2873452341184383832@icedtea.classpath.org>

changeset e58c66c7c2ee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e58c66c7c2ee
description:
	Integrate b13 drop fixes.

	2008-11-08  Mark Wielaard  <mark at klomp.org>

		* Makefile.am (OPENJDK_DATE, OPENJDK_MD5SUM, OPENJDK_VERSION):
		Update for b13.
		(ICEDTEA_PATCHES): Removed patches 6616825, 6651382, 6756202.
		* patches/icedtea-6open-6616825.patch: Removed.
		* patches/icedtea-6open-6651382.patch: Removed.
		* patches/icedtea-6open-6756202.patch: Removed.
		* NEWS: Add integration of b13.

diffstat:

6 files changed, 17 insertions(+), 436 deletions(-)
ChangeLog                           |   10 +
Makefile.am                         |    9 -
NEWS                                |    4 
patches/icedtea-6open-6616825.patch |  294 -----------------------------------
patches/icedtea-6open-6651382.patch |  116 -------------
patches/icedtea-6open-6756202.patch |   20 --

diffs (493 lines):

diff -r b259b240929b -r e58c66c7c2ee ChangeLog
--- a/ChangeLog	Fri Nov 07 15:53:48 2008 +0000
+++ b/ChangeLog	Sat Nov 08 11:47:10 2008 +0100
@@ -1,3 +1,13 @@ 2008-11-07  Andrew John Hughes  <ahughes
+2008-11-08  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (OPENJDK_DATE, OPENJDK_MD5SUM, OPENJDK_VERSION):
+	Update for b13.
+	(ICEDTEA_PATCHES): Removed patches 6616825, 6651382, 6756202.
+	* patches/icedtea-6open-6616825.patch: Removed.
+	* patches/icedtea-6open-6651382.patch: Removed.
+	* patches/icedtea-6open-6756202.patch: Removed.
+	* NEWS: Add integration of b13.
+
 2008-11-07  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Use 'node|short' instead of 'rev'
diff -r b259b240929b -r e58c66c7c2ee Makefile.am
--- a/Makefile.am	Fri Nov 07 15:53:48 2008 +0000
+++ b/Makefile.am	Sat Nov 08 11:47:10 2008 +0100
@@ -1,6 +1,6 @@ OPENJDK_DATE = 28_aug_2008
-OPENJDK_DATE = 28_aug_2008
-OPENJDK_MD5SUM = b53e1ef643909ce82721ee4c970d958b
-OPENJDK_VERSION = b12
+OPENJDK_DATE = 05_nov_2008
+OPENJDK_MD5SUM = 3b6975c8eaf465396c8c488a9877f259
+OPENJDK_VERSION = b13
 
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
@@ -527,9 +527,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-arch.patch \
 	patches/icedtea-lc_ctype.patch \
 	patches/icedtea-messageutils.patch \
-	patches/icedtea-6open-6616825.patch \
-	patches/icedtea-6open-6651382.patch \
-	patches/icedtea-6open-6756202.patch \
 	$(VISUALVM_PATCH) \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
diff -r b259b240929b -r e58c66c7c2ee NEWS
--- a/NEWS	Fri Nov 07 15:53:48 2008 +0000
+++ b/NEWS	Sat Nov 08 11:47:10 2008 +0100
@@ -1,3 +1,7 @@ New in release 1.3.1 (2008-10-27)
+New in release 1.4 (NOT_YET_RELEASED)
+
+- Integrated b13 drop fixes.
+
 New in release 1.3.1 (2008-10-27)
 
 - Plugin including LiveConnect support built as default.
diff -r b259b240929b -r e58c66c7c2ee patches/icedtea-6open-6616825.patch
--- a/patches/icedtea-6open-6616825.patch	Fri Nov 07 15:53:48 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
---- openjdk/jdk/src/share/classes/javax/management/ObjectName.java	Wed Oct  8 06:07:09 2008
-+++ openjdk/jdk/src/share/classes/javax/management/ObjectName.java	Wed Oct  8 06:07:09 2008
-@@ -37,9 +37,6 @@
- import java.util.HashMap;
- import java.util.Hashtable;
- import java.util.Map;
--import javax.management.MBeanServer;
--import javax.management.MalformedObjectNameException;
--import javax.management.QueryExp;
- 
- /**
-  * <p>Represents the object name of an MBean, or a pattern that can
-@@ -1159,9 +1156,19 @@
-             //
-             //in.defaultReadObject();
-             final ObjectInputStream.GetField fields = in.readFields();
-+            String propListString =
-+                    (String)fields.get("propertyListString", "");
-+
-+            // 6616825: take care of property patterns
-+            final boolean propPattern =
-+                    fields.get("propertyPattern" , false);
-+            if (propPattern) {
-+                propListString =
-+                        (propListString.length()==0?"*":(propListString+",*"));
-+            }
-+
-             cn = (String)fields.get("domain", "default")+
--                ":"+
--                (String)fields.get("propertyListString", "");
-+                ":"+ propListString;
-         } else {
-             // Read an object serialized in the new serial form
-             //
-@@ -1795,6 +1802,7 @@
-      * @return True if <code>object</code> is an ObjectName whose
-      * canonical form is equal to that of this ObjectName.
-      */
-+    @Override
-     public boolean equals(Object object)  {
- 
-         // same object case
-@@ -1818,6 +1826,7 @@
-      * Returns a hash code for this object name.
-      *
-      */
-+    @Override
-     public int hashCode() {
-         return _canonicalName.hashCode();
-     }
---- openjdk/jdk/test/javax/management/ObjectName/SerialCompatTest.java	Wed Oct  8 06:07:12 2008
-+++ openjdk/jdk/test/javax/management/ObjectName/SerialCompatTest.java	Wed Oct  8 06:07:12 2008
-@@ -23,9 +23,9 @@
- 
- /*
-  * @test
-- * @bug 6211220
-+ * @bug 6211220 6616825
-  * @summary Test that jmx.serial.form=1.0 works for ObjectName
-- * @author Eamonn McManus
-+ * @author Eamonn McManus, Daniel Fuchs
-  * @run clean SerialCompatTest
-  * @run build SerialCompatTest
-  * @run main/othervm SerialCompatTest
-@@ -36,20 +36,8 @@
- import javax.management.ObjectName;
- 
- public class SerialCompatTest {
--    public static void main(String[] args) throws Exception {
--        System.setProperty("jmx.serial.form", "1.0");
-+    public static void check6211220() throws Exception {
- 
--        /* Check that we really are in jmx.serial.form=1.0 mode.
--           The property is frozen the first time the ObjectName class
--           is referenced so checking that it is set to the correct
--           value now is not enough.  */
--        ObjectStreamClass osc = ObjectStreamClass.lookup(ObjectName.class);
--        if (osc.getFields().length != 6) {
--            throw new Exception("Not using old serial form: fields: " +
--                                Arrays.asList(osc.getFields()));
--            // new serial form has no fields, uses writeObject
--        }
--
-         ObjectName on = new ObjectName("a:b=c");
-         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-         ObjectOutputStream oos = new ObjectOutputStream(bos);
-@@ -62,53 +50,192 @@
- 
-         // if the bug is present, these will get NullPointerException
-         for (int i = 0; i <= 11; i++) {
-+            String msg = "6211220 case("+i+")";
-             try {
-                 switch (i) {
-                 case 0:
--                    check(on1.getDomain().equals("a")); break;
-+                    check(msg, on1.getDomain().equals("a")); break;
-                 case 1:
--                    check(on1.getCanonicalName().equals("a:b=c")); break;
-+                    check(msg, on1.getCanonicalName().equals("a:b=c")); break;
-                 case 2:
--                    check(on1.getKeyPropertyListString().equals("b=c")); break;
-+                    check(msg, on1.getKeyPropertyListString().equals("b=c"));
-+                    break;
-                 case 3:
--                    check(on1.getCanonicalKeyPropertyListString().equals("b=c"));
-+                    check(msg, on1.getCanonicalKeyPropertyListString()
-+                            .equals("b=c"));
-                     break;
-                 case 4:
--                    check(on1.getKeyProperty("b").equals("c")); break;
-+                    check(msg, on1.getKeyProperty("b").equals("c")); break;
-                 case 5:
--                    check(on1.getKeyPropertyList()
-+                    check(msg, on1.getKeyPropertyList()
-                           .equals(Collections.singletonMap("b", "c"))); break;
-                 case 6:
--                    check(!on1.isDomainPattern()); break;
-+                    check(msg, !on1.isDomainPattern()); break;
-                 case 7:
--                    check(!on1.isPattern()); break;
-+                    check(msg, !on1.isPattern()); break;
-                 case 8:
--                    check(!on1.isPropertyPattern()); break;
-+                    check(msg, !on1.isPropertyPattern()); break;
-                 case 9:
--                    check(on1.equals(on)); break;
-+                    check(msg, on1.equals(on)); break;
-                 case 10:
--                    check(on.equals(on1)); break;
-+                    check(msg, on.equals(on1)); break;
-                 case 11:
--                    check(on1.apply(on)); break;
-+                    check(msg, on1.apply(on)); break;
-                 default:
-+                    throw new Exception(msg+": Test incorrect");
-+                }
-+            } catch (Exception e) {
-+                System.out.println(msg+": Test failed with exception:");
-+                e.printStackTrace(System.out);
-+                failed = true;
-+            }
-+        }
-+
-+        if (failed)
-+            throw new Exception("Some tests for 6211220 failed");
-+        else
-+            System.out.println("All tests for 6211220 passed");
-+    }
-+
-+    static void checkName(String testname, ObjectName on)
-+        throws Exception {
-+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-+        ObjectOutputStream oos = new ObjectOutputStream(bos);
-+        oos.writeObject(on);
-+        oos.close();
-+        byte[] bytes = bos.toByteArray();
-+        ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
-+        ObjectInputStream ois = new ObjectInputStream(bis);
-+        ObjectName on1 = (ObjectName) ois.readObject();
-+        // if the bug is present, these will get NullPointerException
-+        for (int i = 0; i <= 11; i++) {
-+            String msg = testname + " case("+i+")";
-+            try {
-+                switch (i) {
-+                case 0:
-+                    check(msg,on1.getDomain().equals(on.getDomain()));
-+                    break;
-+                case 1:
-+                    check(msg,on1.getCanonicalName().
-+                         equals(on.getCanonicalName()));
-+                    break;
-+                case 2:
-+                    check(msg,on1.getKeyPropertyListString().
-+                            equals(on.getKeyPropertyListString())); break;
-+                case 3:
-+                    check(msg,on1.getCanonicalKeyPropertyListString().
-+                            equals(on.getCanonicalKeyPropertyListString()));
-+                    break;
-+                case 4:
-+                    for (Object ko : on1.getKeyPropertyList().keySet()) {
-+			final String key = (String) ko;
-+                            check(msg,on1.getKeyProperty(key).
-+                                    equals(on.getKeyProperty(key)));
-+                    }
-+                    for (Object ko : on.getKeyPropertyList().keySet()) {
-+			final String key = (String) ko;
-+                            check(msg,on1.getKeyProperty(key).
-+                                    equals(on.getKeyProperty(key)));
-+                    }
-+                case 5:
-+                    check(msg,on1.getKeyPropertyList()
-+                          .equals(on.getKeyPropertyList())); break;
-+                case 6:
-+                    check(msg,on1.isDomainPattern()==on.isDomainPattern());
-+                    break;
-+                case 7:
-+                    check(msg,on1.isPattern()==on.isPattern()); break;
-+                case 8:
-+                    check(msg,
-+                       on1.isPropertyPattern()==on.isPropertyPattern()); break;
-+                case 9:
-+                    check(msg,on1.equals(on)); break;
-+                case 10:
-+                    check(msg,on.equals(on1)); break;
-+                case 11:
-+                    if (!on.isPattern())
-+                            check(msg,on1.apply(on)); break;
-+                default:
-                     throw new Exception("Test incorrect: case: " + i);
-                 }
-             } catch (Exception e) {
--                System.out.println("Test failed with exception:");
-+                System.out.println("Test ("+i+") failed with exception:");
-                 e.printStackTrace(System.out);
-                 failed = true;
-             }
-         }
- 
-+    }
-+
-+    private static String[] names6616825 = {
-+        "a:b=c","a:b=c,*","*:*",":*",":b=c",":b=c,*",
-+        "a:*,b=c",":*",":*,b=c","*x?:k=\"x\\*z\"","*x?:k=\"x\\*z\",*",
-+        "*x?:*,k=\"x\\*z\"","*x?:k=\"x\\*z\",*,b=c"
-+    };
-+
-+    static void check6616825() throws Exception {
-+        System.out.println("Testing 616825");
-+        for (String n : names6616825) {
-+            final ObjectName on;
-+            try {
-+                on = new ObjectName(n);
-+            } catch (Exception x) {
-+                failed = true;
-+                System.out.println("Unexpected failure for 6616825 ["+n
-+                   +"]: "+x);
-+                x.printStackTrace(System.out);
-+                continue;
-+            }
-+            try {
-+                checkName("616825 "+n,on);
-+            } catch (Exception x) {
-+                failed = true;
-+                System.out.println("6616825 failed for ["+n+"]: "+x);
-+                x.printStackTrace(System.out);
-+            }
-+        }
-+
-         if (failed)
-+            throw new Exception("Some tests for 6616825 failed");
-+        else
-+            System.out.println("All tests for 6616825 passed");
-+    }
-+
-+    public static void main(String[] args) throws Exception {
-+        System.setProperty("jmx.serial.form", "1.0");
-+
-+        /* Check that we really are in jmx.serial.form=1.0 mode.
-+           The property is frozen the first time the ObjectName class
-+           is referenced so checking that it is set to the correct
-+           value now is not enough.  */
-+        ObjectStreamClass osc = ObjectStreamClass.lookup(ObjectName.class);
-+        if (osc.getFields().length != 6) {
-+            throw new Exception("Not using old serial form: fields: " +
-+                                Arrays.asList(osc.getFields()));
-+            // new serial form has no fields, uses writeObject
-+        }
-+
-+        try {
-+            check6211220();
-+        } catch (Exception x) {
-+            System.err.println(x.getMessage());
-+        }
-+        try {
-+            check6616825();
-+        } catch (Exception x) {
-+            System.err.println(x.getMessage());
-+        }
-+
-+        if (failed)
-             throw new Exception("Some tests failed");
-         else
-             System.out.println("All tests passed");
-+
-     }
- 
--    private static void check(boolean condition) {
-+    private static void check(String msg, boolean condition) {
-         if (!condition) {
--            new Throwable("Test failed").printStackTrace(System.out);
-+            new Throwable("Test failed "+msg).printStackTrace(System.out);
-             failed = true;
-         }
-     }
diff -r b259b240929b -r e58c66c7c2ee patches/icedtea-6open-6651382.patch
--- a/patches/icedtea-6open-6651382.patch	Fri Nov 07 15:53:48 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java	Tue Oct  7 08:43:32 2008
-+++ openjdk/jdk/src/share/classes/sun/management/snmp/jvminstr/JvmMemPoolEntryImpl.java	Tue Oct  7 08:43:32 2008
-@@ -26,7 +26,6 @@
- 
- // java imports
- //
--import java.io.Serializable;
- import java.util.Map;
- 
- // jmx imports
-@@ -36,9 +35,7 @@
- 
- // jdmk imports
- //
--import com.sun.jmx.snmp.agent.SnmpMib;
- 
--import java.lang.management.ManagementFactory;
- import java.lang.management.MemoryUsage;
- import java.lang.management.MemoryType;
- import java.lang.management.MemoryPoolMXBean;
-@@ -73,8 +70,10 @@
-         "jvmMemPoolEntry.getCollectionUsage";
-     final static MemoryUsage ZEROS = new MemoryUsage(0,0,0,0);
- 
--
--
-+    final String entryMemoryTag;
-+    final String entryPeakMemoryTag;
-+    final String entryCollectMemoryTag;
-+    
-     MemoryUsage getMemoryUsage() {
-         try {
-             final Map<Object, Object> m = JvmContextFactory.getUserData();
-@@ -81,10 +80,10 @@
- 
-             if (m != null) {
-                 final MemoryUsage cached = (MemoryUsage)
--                    m.get(memoryTag);
-+                    m.get(entryMemoryTag);
-                 if (cached != null) {
--                    log.debug("getMemoryUsage",
--                          "jvmMemPoolEntry.getUsage found in cache.");
-+                    log.debug("getMemoryUsage",entryMemoryTag+
-+                          " found in cache.");
-                     return cached;
-                 }
- 
-@@ -91,7 +90,7 @@
-                 MemoryUsage u = pool.getUsage();
-                 if (u == null) u = ZEROS;
- 
--                m.put(memoryTag,u);
-+                m.put(entryMemoryTag,u);
-                 return u;
-             }
-             // Should never come here.
-@@ -113,11 +112,11 @@
- 
-             if (m != null) {
-                 final MemoryUsage cached = (MemoryUsage)
--                    m.get(peakMemoryTag);
-+                    m.get(entryPeakMemoryTag);
-                 if (cached != null) {
-                     if (log.isDebugOn())
-                         log.debug("getPeakMemoryUsage",
--                              peakMemoryTag + " found in cache.");
-+                              entryPeakMemoryTag + " found in cache.");
-                     return cached;
-                 }
- 
-@@ -124,7 +123,7 @@
-                 MemoryUsage u = pool.getPeakUsage();
-                 if (u == null) u = ZEROS;
- 
--                m.put(peakMemoryTag,u);
-+                m.put(entryPeakMemoryTag,u);
-                 return u;
-             }
-             // Should never come here.
-@@ -146,11 +145,11 @@
- 
-             if (m != null) {
-                 final MemoryUsage cached = (MemoryUsage)
--                    m.get(collectMemoryTag);
-+                    m.get(entryCollectMemoryTag);
-                 if (cached != null) {
-                     if (log.isDebugOn())
-                         log.debug("getCollectMemoryUsage",
--                                  collectMemoryTag + " found in cache.");
-+                                  entryCollectMemoryTag + " found in cache.");
-                     return cached;
-                 }
- 
-@@ -157,7 +156,7 @@
-                 MemoryUsage u = pool.getCollectionUsage();
-                 if (u == null) u = ZEROS;
- 
--                m.put(collectMemoryTag,u);
-+                m.put(entryCollectMemoryTag,u);
-                 return u;
-             }
-             // Should never come here.
-@@ -179,9 +178,12 @@
-     /**
-      * Constructor for the "JvmMemPoolEntry" group.
-      */
--    public JvmMemPoolEntryImpl(MemoryPoolMXBean mp, int index) {
-+    public JvmMemPoolEntryImpl(MemoryPoolMXBean mp, final int index) {
-         this.pool=mp;
-         this.jvmMemPoolIndex = index;
-+        this.entryMemoryTag = memoryTag + "." + index;
-+        this.entryPeakMemoryTag = peakMemoryTag + "." + index;
-+        this.entryCollectMemoryTag = collectMemoryTag + "." + index;
-     }
- 
-     /**
diff -r b259b240929b -r e58c66c7c2ee patches/icedtea-6open-6756202.patch
--- a/patches/icedtea-6open-6756202.patch	Fri Nov 07 15:53:48 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
---- openjdk/jdk/make/netbeans/jmx/build.properties	Wed Oct  8 09:13:27 2008
-+++ openjdk/jdk/make/netbeans/jmx/build.properties	Wed Oct  8 09:13:27 2008
-@@ -42,14 +42,14 @@
-     java/lang/management/ \
-     javax/management/
- 
--project.spec.version			= JMX API 2.0
-+project.spec.version			= JMX API 1.4
- 
- jar.jmx.name				= jmx.jar
- jar.jmx.sealed				= true
--jar.jmx.spec.title			= JSR 003, 160, 255 - JMX API
-+jar.jmx.spec.title			= JSR 003, 160 - JMX API
- jar.jmx.spec.version			= ${project.spec.version}
- jar.jmx.spec.vendor			= Sun Microsystems, Inc.
--jar.jmx.impl.title			= JSR 003, 160, 255 - OpenJDK 7 JMX API 
-+jar.jmx.impl.title			= JSR 003, 160 - OpenJDK 6 JMX API 
- jar.jmx.impl.vendor			= Project OpenJDK
- 
- javadoc.options=-J-Xmx256m


From mark at klomp.org  Sat Nov  8 08:18:04 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 17:18:04 +0100
Subject: OpenJDK 6 build 13 source posted
In-Reply-To: <4914B853.9050203@sun.com>
References: <4914B853.9050203@sun.com>
Message-ID: <1226161084.3276.10.camel@dijkstra.wildebeest.org>

Hi Hackers,

On Fri, 2008-11-07 at 13:51 -0800, Joseph D. Darcy wrote:
> The source bundle for OpenJDK 6 build 13 is available for download from:
> 
>     http://download.java.net/openjdk/jdk6/

Imported into mercurial and tagged jdk6-b13:
http://icedtea.classpath.org/hg/openjdk6

$ hg clone http://icedtea.classpath.org/hg/openjdk6
$ hg diff -r jdk6-b12 -r jdk-b13

Will give you a diff of all the changes since the last drop.

Unfortunately because of 6760834 "Normalized whitespace of langtools
area for OpenJDK 6" it contains a lot of noise. A bit more readable diff
can be gotten by using hg diff -wbB to filter out the worst whitespace
noise.

Also integrated into IcedTea6 now by removing the patches in b13 now
that were already incorporated in icedtea.

2008-11-08  Mark Wielaard  <mark at klomp.org>

    * Makefile.am (OPENJDK_DATE, OPENJDK_MD5SUM, OPENJDK_VERSION):
    Update for b13.
    (ICEDTEA_PATCHES): Removed patches 6616825, 6651382, 6756202.
    * patches/icedtea-6open-6616825.patch: Removed.
    * patches/icedtea-6open-6651382.patch: Removed.
    * patches/icedtea-6open-6756202.patch: Removed.
    * NEWS: Add integration of b13.

Note that the MD5SUM (3b6975c8eaf465396c8c488a9877f259) is the one I did
locally because the Checksums file (*) only contains the md5s for the
(unpublished?) zip files and we are using the tar.gz one.

Cheers,

Mark

(*)
http://download.java.net/openjdk/jdk6/promoted/b13/openjdk-6-src-b13-05_nov_2008.md5



From mark at klomp.org  Sat Nov  8 08:27:11 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 17:27:11 +0100
Subject: jtreg results
In-Reply-To: <1226161084.3276.10.camel@dijkstra.wildebeest.org>
References: <4914B853.9050203@sun.com>
	<1226161084.3276.10.camel@dijkstra.wildebeest.org>
Message-ID: <1226161631.3276.20.camel@dijkstra.wildebeest.org>

Hi,

I saw that Joe published jtreg results for plain openjdk6:
http://blogs.sun.com/darcy/entry/openjdk6_build_13_regression_tests

To compare I uploaded my JTreport and JTwork directories for the
integrated IcedTea6 build (x86_64/Fedora 9), changeset e58c66c7c2ee,
after a ./autogen.sh && ./configure && make && make check

http://icedtea.classpath.org/~mjw/jtreg/

test/check-hotspot.log:
  Test results: passed: 20
test/check-jdk.log:
  Test results: passed: 3,274; failed: 41; error: 3
test/check-langtools.log:
  Test results: passed: 1,350; failed: 1

Cheers,

Mark



From mark at klomp.org  Sat Nov  8 09:17:57 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 17:17:57 +0000
Subject: changeset in /hg/icedtea6: * Makefile.am (OPENJDK_MD5SUM): Fixed...
Message-ID: <hg.285c8111f751.1226164677.2873452341184383832@icedtea.classpath.org>

changeset 285c8111f751 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=285c8111f751
description:
	* Makefile.am (OPENJDK_MD5SUM): Fixed value.

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog   |    4 ++++
Makefile.am |    2 +-

diffs (21 lines):

diff -r e58c66c7c2ee -r 285c8111f751 ChangeLog
--- a/ChangeLog	Sat Nov 08 11:47:10 2008 +0100
+++ b/ChangeLog	Sat Nov 08 18:17:50 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-08  Mark Wielaard  <mark at klomp.o
+2008-11-08  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (OPENJDK_MD5SUM): Fixed value.
+
 2008-11-08  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (OPENJDK_DATE, OPENJDK_MD5SUM, OPENJDK_VERSION):
diff -r e58c66c7c2ee -r 285c8111f751 Makefile.am
--- a/Makefile.am	Sat Nov 08 11:47:10 2008 +0100
+++ b/Makefile.am	Sat Nov 08 18:17:50 2008 +0100
@@ -1,5 +1,5 @@ OPENJDK_DATE = 05_nov_2008
 OPENJDK_DATE = 05_nov_2008
-OPENJDK_MD5SUM = 3b6975c8eaf465396c8c488a9877f259
+OPENJDK_MD5SUM = eb9a408ac0215f3f0aa5c02fa86d5b30
 OPENJDK_VERSION = b13
 
 CACAO_VERSION = 0.99.3


From mark at klomp.org  Sat Nov  8 09:18:04 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 18:18:04 +0100
Subject: OpenJDK 6 build 13 source posted
In-Reply-To: <1226161084.3276.10.camel@dijkstra.wildebeest.org>
References: <4914B853.9050203@sun.com>
	<1226161084.3276.10.camel@dijkstra.wildebeest.org>
Message-ID: <1226164684.3276.25.camel@dijkstra.wildebeest.org>

On Sat, 2008-11-08 at 17:18 +0100, Mark Wielaard wrote:
> Note that the MD5SUM (3b6975c8eaf465396c8c488a9877f259) is the one I
> did locally because the Checksums file (*) only contains the md5s for
> the (unpublished?) zip files and we are using the tar.gz one.

Doh, and I pasted in the wrong one... sigh. Fixed:

2008-11-08  Mark Wielaard  <mark at klomp.org>

        * Makefile.am (OPENJDK_MD5SUM): Fixed value.

Cheers,

Mark

diff -r e58c66c7c2ee Makefile.am
--- a/Makefile.am	Sat Nov 08 11:47:10 2008 +0100
+++ b/Makefile.am	Sat Nov 08 18:16:57 2008 +0100
@@ -1,5 +1,5 @@
 OPENJDK_DATE = 05_nov_2008
-OPENJDK_MD5SUM = 3b6975c8eaf465396c8c488a9877f259
+OPENJDK_MD5SUM = eb9a408ac0215f3f0aa5c02fa86d5b30
 OPENJDK_VERSION = b13
 
 CACAO_VERSION = 0.99.3




From mark at klomp.org  Sat Nov  8 12:25:58 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 20:25:58 +0000
Subject: changeset in /hg/icedtea6: * Makefile.am (ICEDTEA_ENV): Set MILE...
Message-ID: <hg.df03b256c9e0.1226175958.2873452341184383832@icedtea.classpath.org>

changeset df03b256c9e0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=df03b256c9e0
description:
	* Makefile.am (ICEDTEA_ENV): Set MILESTONE to fcs.
		* patches/icedtea-version.patch: Remove special casing of
		MILESTONE in hotspot build, add special casing of milestone in
		langtools build.

diffstat:

3 files changed, 23 insertions(+), 14 deletions(-)
ChangeLog                     |    7 +++++++
Makefile.am                   |    2 ++
patches/icedtea-version.patch |   28 ++++++++++++++--------------

diffs (75 lines):

diff -r 285c8111f751 -r df03b256c9e0 ChangeLog
--- a/ChangeLog	Sat Nov 08 18:17:50 2008 +0100
+++ b/ChangeLog	Sat Nov 08 21:25:47 2008 +0100
@@ -1,3 +1,10 @@ 2008-11-08  Mark Wielaard  <mark at klomp.o
+2008-11-08  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (ICEDTEA_ENV): Set MILESTONE to fcs.
+	* patches/icedtea-version.patch: Remove special casing of
+	MILESTONE in hotspot build, add special casing of milestone in
+	langtools build.
+
 2008-11-08  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (OPENJDK_MD5SUM): Fixed value.
diff -r 285c8111f751 -r df03b256c9e0 Makefile.am
--- a/Makefile.am	Sat Nov 08 18:17:50 2008 +0100
+++ b/Makefile.am	Sat Nov 08 21:25:47 2008 +0100
@@ -140,6 +140,7 @@ ICEDTEA_ENV = \
         "BUILD_NUMBER=$(OPENJDK_VERSION)" \
 	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
         "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \
+	"MILESTONE=fcs" \
 	"LANG=C" \
 	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
@@ -209,6 +210,7 @@ ICEDTEA_ENV_ECJ = \
 	"BUILD_NUMBER=$(OPENJDK_VERSION)" \
 	"JDK_UPDATE_VERSION=$(JDK_UPDATE_VERSION)" \
         "JRE_RELEASE_VERSION=1.6.0_$(COMBINED_VERSION)" \
+	"MILESTONE=fcs" \
 	"LANG=C" \
 	"PATH=$(abs_top_builddir)/bootstrap/jdk1.6.0/bin:/usr/bin:/bin:/usr/sbin:/sbin" \
 	"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
diff -r 285c8111f751 -r df03b256c9e0 patches/icedtea-version.patch
--- a/patches/icedtea-version.patch	Sat Nov 08 18:17:50 2008 +0100
+++ b/patches/icedtea-version.patch	Sat Nov 08 21:25:47 2008 +0100
@@ -12,20 +12,6 @@ diff -Nru openjdk.orig/jdk/make/common/s
    PRODUCT_SUFFIX = Runtime Environment
    JDK_RC_PLATFORM_NAME = Platform
    COMPANY_NAME = N/A
-@@ -260,12 +260,7 @@
- JDK_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_VERSION))
- JDK_MKTG_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_MKTG_VERSION))
- 
--# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
--ifneq ($(MILESTONE),fcs)
--  RELEASE      = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
--else
--  RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
--endif
-+RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
- 
- # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
- ifdef BUILD_NUMBER
 --- openjdk/hotspot/src/share/vm/utilities/vmError.cpp~	2008-08-28 10:23:18.000000000 +0200
 +++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp	2008-10-21 14:05:12.000000000 +0200
 @@ -168,7 +168,8 @@
@@ -61,3 +47,17 @@ diff -Nru openjdk.orig/jdk/make/common/s
  # CFLAGS_WARN holds compiler options to suppress/enable warnings.
  CFLAGS += $(CFLAGS_WARN/BYFILE)
  
+--- openjdk/langtools/make/Makefile.orig
++++ openjdk/langtools/make/Makefile
+@@ -82,7 +82,11 @@
+ endif 
+ 
+ ifdef MILESTONE
++ifneq ($(MILESTONE),fcs)
+   ANT_OPTIONS += -Dmilestone=$(MILESTONE)
++else
++  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
++endif
+ endif
+ 
+ ifdef BUILD_NUMBER


From mark at klomp.org  Sat Nov  8 12:32:14 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 08 Nov 2008 21:32:14 +0100
Subject: One more version (milestone) tweak
Message-ID: <1226176334.3276.32.camel@dijkstra.wildebeest.org>

Hi,

The openjdk build supports setting the MILESTONE to the magic string fcs
to get more sane version release strings. Doing that means we need less
magic to support our own version release strings. This means one less
patch to hardcode the string. We still do need a tweak to the ant build
files that don't handle it yet. I'll push that upstream.

2008-11-08  Mark Wielaard  <mark at klomp.org>

    * Makefile.am (ICEDTEA_ENV): Set MILESTONE to fcs.
    * patches/icedtea-version.patch: Remove special casing of
    MILESTONE in hotspot build, add special casing of milestone in
    langtools build.

Now also all tools will have a sane version release string. As a bonus
this also solves the last make check-langtools FAIL turn into a PASS.
This should also help with any scripts that are picky about the precise
version/release/number in the output of the java* -version tools.

Committed,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: version-milestone.patch
Type: text/x-patch
Size: 2262 bytes
Desc: 
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081108/2659ca11/version-milestone.patch 

From bugzilla-daemon at icedtea.classpath.org  Sun Nov  9 04:01:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 09 Nov 2008 12:01:49 +0000
Subject: [Bug 252] New: DaCapo xalan crashed on Zero ppc64
Message-ID: <E1Kz8zF-0006vs-Hn@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=252

           Summary: DaCapo xalan crashed on Zero ppc64
           Product: IcedTea
           Version: unspecified
          Platform: Macintosh
        OS/Version: Linux
            Status: NEW
          Severity: critical
          Priority: P1
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: twisti at complang.tuwien.ac.at


This happened this nightly run:

http://c1.complang.tuwien.ac.at/pipermail/cacao-testresults/2008-November/005464.html


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov  9 04:02:14 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 09 Nov 2008 12:02:14 +0000
Subject: [Bug 252] DaCapo xalan crashed on Zero ppc64
Message-ID: <E1Kz8ze-0006vx-C0@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=252





------- Comment #1 from twisti at complang.tuwien.ac.at  2008-11-09 12:02 -------
Created an attachment (id=135)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=135&action=view)
hs_err_pid30746.log


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From vacek008 at umn.edu  Sun Nov  9 12:38:13 2008
From: vacek008 at umn.edu (Tom Vacek)
Date: Sun, 09 Nov 2008 14:38:13 -0600
Subject: IcedTea and HP RILOE II
Message-ID: <49174A35.60500@umn.edu>

I tried Iced Tea with Fedora 10 preview.  It's fabulous!  It doesn't
work, though, for the remote console applet on my HP Remote Insight
Lights Out II card.  How do I view the console messages for the Iced Tea
plugin (aka open the console).  It seems like it should be obvious, but 
it had me stumped.

Thanks,

Tom



From mark at klomp.org  Sun Nov  9 13:13:03 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 09 Nov 2008 22:13:03 +0100
Subject: IcedTea and HP RILOE II
In-Reply-To: <49174A35.60500@umn.edu>
References: <49174A35.60500@umn.edu>
Message-ID: <1226265183.16873.3.camel@dijkstra.wildebeest.org>

Hi Tom,

On Sun, 2008-11-09 at 14:38 -0600, Tom Vacek wrote:
> I tried Iced Tea with Fedora 10 preview.  It's fabulous!

Thanks. We hack to please! :)

> It doesn't
> work, though, for the remote console applet on my HP Remote Insight
> Lights Out II card.  How do I view the console messages for the Iced Tea
> plugin (aka open the console).  It seems like it should be obvious, but 
> it had me stumped.

It isn't completely obvious unfortunately. What I do to debug applets in
the firefox browser is run it on the command line with "firefox -g".
This drops you in gdb, just say "run". That will give you output on in
your terminal and if things crash you can use gdb to get a backtrace
("bt").

If you want lots (and really lots) of extra debugging out put do:
"export ICEDTEAPLUGIN_DEBUG=1" before starting firefox on the command
line and it will spit out lots of extra info on what it is doing.

Good luck,

Mark



From mark at klomp.org  Sun Nov  9 13:31:58 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 09 Nov 2008 21:31:58 +0000
Subject: changeset in /hg/icedtea6: Upgrade to jtreg-4_0-src-b02-15_oct_2...
Message-ID: <hg.76b5306fead0.1226266318.2873452341184383832@icedtea.classpath.org>

changeset 76b5306fead0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=76b5306fead0
description:
	Upgrade to jtreg-4_0-src-b02-15_oct_2008.

diffstat:

18 files changed, 1771 insertions(+), 583 deletions(-)
ChangeLog                                                          |   21 
test/jtreg/README                                                  |    2 
test/jtreg/com/sun/javatest/diff/Diff.java                         |  161 ++
test/jtreg/com/sun/javatest/diff/Fault.java                        |   40 
test/jtreg/com/sun/javatest/diff/HTMLReporter.java                 |  184 ++-
test/jtreg/com/sun/javatest/diff/HTMLWriter.java                   |  558 ++++++++++
test/jtreg/com/sun/javatest/diff/Main.java                         |  181 ---
test/jtreg/com/sun/javatest/diff/MultiMap.java                     |   79 -
test/jtreg/com/sun/javatest/diff/ReportReader.java                 |   38 
test/jtreg/com/sun/javatest/diff/StandardDiff.java                 |   42 
test/jtreg/com/sun/javatest/diff/SuperDiff.java                    |  342 ++++++
test/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java          |   30 
test/jtreg/com/sun/javatest/diff/i18n.properties                   |   30 
test/jtreg/com/sun/javatest/regtest/Main.java                      |  503 ++++-----
test/jtreg/com/sun/javatest/regtest/MainAction.java                |   82 -
test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java |   17 
test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java      |   43 
test/jtreg/com/sun/javatest/regtest/i18n.properties                |    1 

diffs (truncated from 4178 to 500 lines):

diff -r 93e7061da818 -r 76b5306fead0 ChangeLog
--- a/ChangeLog	Sun Nov 09 22:27:11 2008 +0100
+++ b/ChangeLog	Sun Nov 09 22:29:59 2008 +0100
@@ -1,3 +1,24 @@ 2008-11-09  Mark Wielaard  <mark at klomp.o
+2008-11-09  Mark Wielaard  <mark at klomp.org>
+
+	* test/jtreg/README,
+	test/jtreg/com/sun/javatest/diff/HTMLReporter.java,
+	test/jtreg/com/sun/javatest/diff/Main.java,
+	test/jtreg/com/sun/javatest/diff/MultiMap.java,
+	test/jtreg/com/sun/javatest/diff/ReportReader.java,
+	test/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java,
+	test/jtreg/com/sun/javatest/diff/i18n.properties,
+	test/jtreg/com/sun/javatest/regtest/Main.java,
+	test/jtreg/com/sun/javatest/regtest/MainAction.java,
+	test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java,
+	test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java,
+	test/jtreg/com/sun/javatest/regtest/i18n.properties,
+	test/jtreg/com/sun/javatest/diff/Diff.java,
+	test/jtreg/com/sun/javatest/diff/Fault.java,
+	test/jtreg/com/sun/javatest/diff/HTMLWriter.java,
+	test/jtreg/com/sun/javatest/diff/StandardDiff.java,
+	test/jtreg/com/sun/javatest/diff/SuperDiff.java,
+	Upgrade to jtreg-4_0-src-b02-15_oct_2008.
+
 2008-11-09  Mark Wielaard  <mark at klomp.org>
 
 	* .hgignore: Add test/check-.*log.
diff -r 93e7061da818 -r 76b5306fead0 test/jtreg/README
--- a/test/jtreg/README	Sun Nov 09 22:27:11 2008 +0100
+++ b/test/jtreg/README	Sun Nov 09 22:29:59 2008 +0100
@@ -20,7 +20,7 @@ This version is based on:
 This version is based on:
 
 - jtharness-oss-4_1_3a-dev
-- jtreg-4_0-src-b01-29_apr_2008
+- jtreg-4_0-src-b02-15_oct_2008
 
 IcedJTReg is distrubuted under the GPLv2.0, like jtreg and jtharness.
 See the documents in the legal directory included in this release.
diff -r 93e7061da818 -r 76b5306fead0 test/jtreg/com/sun/javatest/diff/Diff.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/diff/Diff.java	Sun Nov 09 22:29:59 2008 +0100
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.javatest.diff;
+
+import com.sun.javatest.Status;
+import com.sun.javatest.TestResult;
+import com.sun.javatest.TestSuite;
+import com.sun.javatest.WorkDirectory;
+import com.sun.javatest.util.I18NResourceBundle;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public abstract class Diff {
+
+    public abstract boolean report(File outFile) throws Fault, InterruptedException;
+
+    protected boolean diff(List<File> files, File outFile)
+            throws Fault, InterruptedException {
+        this.outFile = outFile;
+        List<DiffReader> list = new ArrayList<DiffReader>();
+        for (File f: files)
+            list.add(open(f));
+
+        PrintWriter prevOut = out;
+        if (out == null && outFile != null) {
+            try {
+                out = new PrintWriter(new BufferedWriter(new FileWriter(outFile))); // FIXME don't want to use PrintWriter
+            } catch (IOException e) {
+                throw new Fault(i18n, "diff.cantOpenFile", outFile, e);
+            }
+        }
+
+        try {
+            initComparator();
+
+            initReporter();
+            reporter.setTitle(title);
+            reporter.setComparator(comparator);
+            reporter.setReaders(list);
+
+            List<int[]> testCounts = new ArrayList<int[]>();
+            MultiMap<String,TestResult> table = new MultiMap<String,TestResult>();
+            for (DiffReader r: list) {
+                int index = table.addColumn(r.getFile().getPath());
+                int[] counts = new int[Status.NUM_STATES];
+                for (TestResult tr: r) {
+                    table.addRow(index, tr.getTestName(), tr);
+                    counts[tr.getStatus().getType()]++;
+                }
+                testCounts.add(counts);
+            }
+            reporter.setTestCounts(testCounts);
+
+            try {
+                reporter.write(table);
+            } catch (IOException e) {
+                throw new Fault(i18n, "diff.ioError", e);
+            }
+
+            return (reporter.diffs == 0);
+        } finally {
+            if (out != prevOut) {
+//                try {
+                    out.close();
+//                } catch (IOException e) {
+//                    throw new Fault(i18n, "main.ioError", e);
+//                }
+                out = prevOut;
+            }
+        }
+    }
+
+    protected void initFormat() {
+        if (format == null && outFile != null) {
+            String name = outFile.getName();
+            int dot = name.lastIndexOf(".");
+            if (dot != -1)
+                format = name.substring(dot + 1).toLowerCase();
+        }
+    }
+
+    protected void initReporter() throws Fault {
+        if (reporter == null) {
+            try {
+                initFormat();
+                if (format != null && format.equals("html"))
+                    reporter = new HTMLReporter(out);
+                else
+                    reporter = new SimpleReporter(out);
+            } catch (IOException e) {
+                throw new Fault(i18n, "diff.cantOpenReport", e);
+            }
+        }
+    }
+
+    protected void initComparator() {
+        if (comparator == null)
+            comparator = new StatusComparator(includeReason);
+    }
+
+    protected DiffReader open(File f) throws Fault {
+        if (!f.exists())
+            throw new Fault(i18n, "main.cantFindFile", f);
+
+        try {
+            if (WorkDirectoryReader.accepts(f))
+                return new WorkDirectoryReader(f);
+
+            if (ReportReader.accepts(f))
+                return new ReportReader(f);
+
+            throw new Fault(i18n, "main.unrecognizedFile", f);
+
+        } catch (TestSuite.Fault e) {
+            throw new Fault(i18n, "main.cantOpenFile", f, e);
+        } catch (WorkDirectory.Fault e) {
+            throw new Fault(i18n, "main.cantOpenFile", f, e);
+        } catch (IOException e) {
+            throw new Fault(i18n, "main.cantOpenFile", f, e);
+        }
+
+    }
+
+    protected File outFile;
+    protected PrintWriter out;
+    protected Comparator<TestResult> comparator;
+    protected Reporter reporter;
+    protected boolean includeReason;
+    protected String format;
+    protected String title;
+    private static I18NResourceBundle i18n = I18NResourceBundle.getBundleForClass(Diff.class);
+}
diff -r 93e7061da818 -r 76b5306fead0 test/jtreg/com/sun/javatest/diff/Fault.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jtreg/com/sun/javatest/diff/Fault.java	Sun Nov 09 22:29:59 2008 +0100
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package com.sun.javatest.diff;
+
+import com.sun.javatest.util.I18NResourceBundle;
+
+/**
+ * Exception to report a problem while executing in Main.
+ */
+public class Fault extends Exception {
+
+    static final long serialVersionUID = 1607979458544175906L;
+
+    Fault(I18NResourceBundle i18n, String s, Object... args) {
+        super(i18n.getString(s, args));
+    }
+}
diff -r 93e7061da818 -r 76b5306fead0 test/jtreg/com/sun/javatest/diff/HTMLReporter.java
--- a/test/jtreg/com/sun/javatest/diff/HTMLReporter.java	Sun Nov 09 22:27:11 2008 +0100
+++ b/test/jtreg/com/sun/javatest/diff/HTMLReporter.java	Sun Nov 09 22:29:59 2008 +0100
@@ -33,7 +33,6 @@ import java.util.Map;
 
 import com.sun.javatest.TestResult;
 import com.sun.javatest.Status;
-import com.sun.javatest.util.HTMLWriter;
 import com.sun.javatest.util.I18NResourceBundle;
 
 import static com.sun.javatest.util.HTMLWriter.*;
@@ -47,8 +46,8 @@ import static com.sun.javatest.util.HTML
  * Report differences to an HTML file.
  */
 public class HTMLReporter extends Reporter {
-    
-    /** Creates a new instance of SimpleDiffReporter */
+
+    /** Creates a new instance of HTMLReporter */
     public HTMLReporter(Writer out) throws IOException {
         this.out = new HTMLWriter(out, DOCTYPE);
         this.out.setI18NResourceBundle(i18n);
@@ -56,10 +55,40 @@ public class HTMLReporter extends Report
 
     public void write(MultiMap<String, TestResult> table) throws IOException {
         this.table = table;
-        
         size = table.getColumns();
-        
+
+        startReport(title);
+
+        out.startTag(H1);
+        if (title == null)
+            out.writeI18N("html.head.notitle");
+        else
+            out.writeI18N("html.head.title", title);
+        out.endTag(H1);
+
+        writeIndexTable();
+        writeMainTable();
+        writeSummary();
+
+        endReport();
+    }
+
+    protected void startReport(String title) throws IOException {
         out.startTag(HTML);
+        writeHead(title);
+        out.startTag(BODY);
+    }
+
+    protected void endReport() throws IOException {
+        out.startTag(HR);
+        out.writeI18N("html.generatedAt", new Date());
+        out.endTag(BODY);
+
+        out.endTag(HTML);
+        out.flush();
+    }
+
+    protected void writeHead(String title) throws IOException {
         out.startTag(HEAD);
         out.startTag(TITLE);
         if (title == null)
@@ -74,40 +103,24 @@ public class HTMLReporter extends Report
         out.write("tr.head { background-color:#dddddd }");
         out.write("tr.odd  { background-color:#eeeeee }");
         out.write("tr.even { background-color:white } ");
-        out.write("td { padding: 0 1em }");
+        out.write("td { padding: 0 .5em }");
         out.write("td.pass { background-color:#ddffdd } ");
         out.write("td.fail { background-color:#ffdddd } ");
         out.write("td.error { background-color:#ddddff } ");
         out.write("td.notRun { background-color:#dddddd } ");
+        out.write("th { padding: 0 .5em }");
         out.write("hr      { margin-top:30px; }");
         out.write("\n");
         out.endTag(STYLE);
         out.endTag(HEAD);
-        
-        out.startTag(BODY);
-        out.startTag(H1);
-        if (title == null)
-            out.writeI18N("html.head.notitle");
-        else
-            out.writeI18N("html.head.title", title);
-        out.endTag(H1);
-        writeHead();
-        writeBody();
-        writeSummary();
-        
-        out.startTag(HR);
-        out.writeI18N("html.generatedAt", new Date());
-        out.endTag(BODY);
-        
-        out.endTag(HTML);
-        out.flush();
-    }
-    
-    private void writeHead() throws IOException {
+
+    }
+
+    private void writeIndexTable() throws IOException {
         out.startTag(H2);
         out.writeI18N("html.head.sets");
         out.endTag(H2);
-        
+
         out.startTag(TABLE);
         out.writeAttr(FRAME, BOX);
         out.writeAttr(RULES, GROUPS);
@@ -120,6 +133,7 @@ public class HTMLReporter extends Report
         out.startTag(TH);
         out.writeI18N("html.th.location");
         out.endTag(TH);
+        writeIndexTableInfoHeadings();
 //        out.startTag(TH);
 //        out.writeI18N("html.th.type");
 //        out.endTag(TH);
@@ -146,16 +160,17 @@ public class HTMLReporter extends Report
         out.endTag(TH);
         out.endTag(TR);
         out.endTag(THEAD);
-        
+
         out.startTag(TBODY);
         for (int i = 0; i < size; i++) {
             out.startTag(TR);
             out.writeAttr(CLASS, (i % 2 == 0 ? EVEN : ODD));
             out.startTag(TD);
-            out.write(String.valueOf(i));
+            out.write(String.valueOf(i + 1));
             out.endTag(TD);
             out.startTag(TD);
             out.write(table.getColumnName(i));
+            writeIndexTableInfoValues(table.getColumnName(i));
             out.endTag(TD);
 //            out.startTag(TD);
 //            out.write("??");
@@ -166,7 +181,7 @@ public class HTMLReporter extends Report
                 out.startTag(TD);
                 if (counts[c] > 0)
                     out.write(String.valueOf(counts[c]));
-                else 
+                else
                     out.writeEntity("&nbsp;");
                 total += counts[c];
                 out.endTag(TD);
@@ -179,8 +194,14 @@ public class HTMLReporter extends Report
         out.endTag(TBODY);
         out.endTag(TABLE);
     }
-    
-    private void writeBody() throws IOException {
+
+    protected void writeIndexTableInfoHeadings() throws IOException {
+    }
+
+    protected void writeIndexTableInfoValues(String name) throws IOException {
+    }
+
+    private void writeMainTable() throws IOException {
         diffs = 0;
         for (Map.Entry<String, MultiMap.Entry<TestResult>> e: table.entrySet()) {
             String testName = e.getKey();
@@ -202,7 +223,10 @@ public class HTMLReporter extends Report
                 out.endTag(TH);
                 for (int i = 0; i < result.getSize(); i++) {
                     out.startTag(TH);
-                    out.writeI18N("html.th.setN", i);
+                    if (compact)
+                        out.write(String.valueOf(i + 1));
+                    else
+                        out.writeI18N("html.th.setN", i + 1);
                     out.endTag(TH);
                 }
                 out.endTag(TR);
@@ -222,36 +246,24 @@ public class HTMLReporter extends Report
                     if (wd != null)
                         trFile = new File(wd, tr.getWorkRelativePath());
                 }
+                out.startTag(TD);
                 Status s = (tr == null ? null : tr.getStatus());
-                out.startTag(TD);
-                String classAttr;
-                String text;
-                switch (s == null ? Status.NOT_RUN : s.getType()) {
-                    case Status.PASSED:
-                        classAttr = PASS;
-                        text = i18n.getString("html.pass");
-                        break;
-                    case Status.FAILED:
-                        classAttr = FAIL;
-                        text = i18n.getString("html.fail");
-                        break;
-                    case Status.ERROR:
-                        classAttr = ERROR;
-                        text = i18n.getString("html.error");
-                        break;
-                    default:
-                        classAttr = NOT_RUN;
-                        text = i18n.getString("html.notRun");
-                        break;
-                }
-                out.writeAttr(CLASS, classAttr);
+                out.writeAttr(CLASS, getClassAttr(s));
+                String text = getText(s);
                 if (trFile != null && trFile.exists()) {
                     out.startTag(A);
                     out.writeAttr(HREF, trFile.toURI().toString());
-                    out.write(text);
+                    if (text.startsWith("&"))
+                        out.writeEntity(text);
+                    else
+                        out.write(text);
                     out.endTag(A);
-                } else
-                    out.write(text);
+                } else {
+                    if (text.startsWith("&"))
+                        out.writeEntity(text);
+                    else
+                        out.write(text);
+                }
                 out.endTag(TD);
             }
             out.endTag(TR);
@@ -262,7 +274,7 @@ public class HTMLReporter extends Report
             out.endTag(TABLE);
         }
     }
-    
+
     private void writeSummary() throws IOException {
         out.startTag(P);
         if (diffs == 0)
@@ -271,27 +283,60 @@ public class HTMLReporter extends Report
             out.writeI18N("html.diffs.count", diffs);
         out.endTag(P);
     }
-    
+
+    protected String getClassAttr(Status s) {
+        switch (s == null ? Status.NOT_RUN : s.getType()) {
+            case Status.PASSED:
+                return PASS;
+            case Status.FAILED:
+                return FAIL;
+            case Status.ERROR:


From mark at klomp.org  Sun Nov  9 13:31:58 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 09 Nov 2008 21:31:58 +0000
Subject: changeset in /hg/icedtea6: * .hgignore: Add test/check-.*log.
Message-ID: <hg.93e7061da818.1226266318.2873452341184383832@icedtea.classpath.org>

changeset 93e7061da818 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=93e7061da818
description:
	* .hgignore: Add test/check-.*log.

diffstat:

2 files changed, 5 insertions(+)
.hgignore |    1 +
ChangeLog |    4 ++++

diffs (22 lines):

diff -r df03b256c9e0 -r 93e7061da818 .hgignore
--- a/.hgignore	Sat Nov 08 21:25:47 2008 +0100
+++ b/.hgignore	Sun Nov 09 22:27:11 2008 +0100
@@ -38,6 +38,7 @@ test/langtools
 test/langtools
 test/jtreg.jar
 test/jtreg/classes
+test/check-.*log
 rt/com/sun/jdi/AbsentInformationException.java
 rt/com/sun/jdi/Accessible.java
 rt/com/sun/jdi/ArrayReference.java
diff -r df03b256c9e0 -r 93e7061da818 ChangeLog
--- a/ChangeLog	Sat Nov 08 21:25:47 2008 +0100
+++ b/ChangeLog	Sun Nov 09 22:27:11 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-08  Mark Wielaard  <mark at klomp.o
+2008-11-09  Mark Wielaard  <mark at klomp.org>
+
+	* .hgignore: Add test/check-.*log.
+
 2008-11-08  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (ICEDTEA_ENV): Set MILESTONE to fcs.


From mark at klomp.org  Sun Nov  9 13:31:59 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 09 Nov 2008 21:31:59 +0000
Subject: changeset in /hg/icedtea6: * Makefile.am (check-langtools): Run ...
Message-ID: <hg.688efd120766.1226266319.2873452341184383832@icedtea.classpath.org>

changeset 688efd120766 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=688efd120766
description:
	* Makefile.am (check-langtools): Run jtreg with -samevm.

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog   |    4 ++++
Makefile.am |    2 +-

diffs (23 lines):

diff -r 76b5306fead0 -r 688efd120766 ChangeLog
--- a/ChangeLog	Sun Nov 09 22:29:59 2008 +0100
+++ b/ChangeLog	Sun Nov 09 22:31:21 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-09  Mark Wielaard  <mark at klomp.o
+2008-11-09  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (check-langtools): Run jtreg with -samevm.
+
 2008-11-09  Mark Wielaard  <mark at klomp.org>
 
 	* test/jtreg/README,
diff -r 76b5306fead0 -r 688efd120766 Makefile.am
--- a/Makefile.am	Sun Nov 09 22:29:59 2008 +0100
+++ b/Makefile.am	Sun Nov 09 22:31:21 2008 +0100
@@ -1588,7 +1588,7 @@ check-langtools: stamps/jtreg.stamp
 	mkdir -p test/langtools/JTwork test/langtools/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/langtools/JTwork -r:test/langtools/JTreport \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/langtools/test \
 	    | tee test/$@.log
 


From mark at klomp.org  Sun Nov  9 13:59:38 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 09 Nov 2008 22:59:38 +0100
Subject: Upgraded to jtreg version 4.0 b02 - huge make check-langtools speedup!
Message-ID: <1226267978.16873.21.camel@dijkstra.wildebeest.org>

Hi,

I upgraded the jtreg part of our (stripped) merged jtharness/jtreg
source code to version 4.0 b02. This has a couple of nice improvements
as described at: http://blogs.sun.com/jjg/entry/jtreg_update

2008-11-09  Mark Wielaard  <mark at klomp.org>

   * test/jtreg/README,
   test/jtreg/com/sun/javatest/diff/HTMLReporter.java,
   test/jtreg/com/sun/javatest/diff/Main.java,
   test/jtreg/com/sun/javatest/diff/MultiMap.java,
   test/jtreg/com/sun/javatest/diff/ReportReader.java,
   test/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java,
   test/jtreg/com/sun/javatest/diff/i18n.properties,
   test/jtreg/com/sun/javatest/regtest/Main.java,
   test/jtreg/com/sun/javatest/regtest/MainAction.java,
   test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java,
   test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java,
   test/jtreg/com/sun/javatest/regtest/i18n.properties,
   test/jtreg/com/sun/javatest/diff/Diff.java,
   test/jtreg/com/sun/javatest/diff/Fault.java,
   test/jtreg/com/sun/javatest/diff/HTMLWriter.java,
   test/jtreg/com/sun/javatest/diff/StandardDiff.java,
   test/jtreg/com/sun/javatest/diff/SuperDiff.java,
   Upgrade to jtreg-4_0-src-b02-15_oct_2008.

This is basically just the diff between b01 and b02 applied to our
sources ignoring any ant tasks that we don't support.

The biggest thing is the addition of -samevm (-svm, -s) to make all the
tests run by default in the same JVM. This is now enabled for make
check-langtools and it is really, really, really, a lot faster. The
tests should now run in less than 25% of the time without -s.
(aka 10 minutes instead of 45 minutes!)

2008-11-09  Mark Wielaard  <mark at klomp.org>

   * Makefile.am (check-langtools): Run jtreg with -samevm.

As Jonathan Gibbons wrote: 
http://blogs.sun.com/jjg/entry/speeding_up_tests_a_langtools

        Can we do the same for the main jdk repository? In principle
        yes, but it will take someone to do it. The good news is that
        jtreg now supports the samevm feature well, and the payoff is
        clear. It does not have to be done all at once: as we did in the
        langtools workspace, all it takes is someone interested to work
        on it section by section. The payoff is worthwhile. 

He is right. This would be really great to have. So if you are looking
for a fun hack job with a very high payoff. Please, go for it!

Cheers,

Mark



From gnu_andrew at member.fsf.org  Sun Nov  9 17:38:16 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 10 Nov 2008 01:38:16 +0000
Subject: changeset in /hg/icedtea: Bump to b39.
Message-ID: <hg.3c4aa7011748.1226281096.-6899778133799504387@icedtea.classpath.org>

changeset 3c4aa7011748 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3c4aa7011748
description:
	Bump to b39.

	2008-11-09  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Bump to b39.
		* patches/icedtea-hotspot-use-idx_t.patch,
		* patches/icedtea-security-updates.patch:
		Remove parts applied/changed in b39.

diffstat:

4 files changed, 21 insertions(+), 440 deletions(-)
ChangeLog                               |    7 
Makefile.am                             |    6 
patches/icedtea-hotspot-use-idx_t.patch |  257 +------------------------------
patches/icedtea-security-updates.patch  |  191 -----------------------

diffs (truncated from 513 to 500 lines):

diff -r e61d84115155 -r 3c4aa7011748 ChangeLog
--- a/ChangeLog	Fri Nov 07 16:31:49 2008 -0500
+++ b/ChangeLog	Mon Nov 10 01:38:03 2008 +0000
@@ -1,3 +1,10 @@ 2008-11-07  Omair Majid  <omajid at redhat.
+2008-11-09  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Bump to b39.
+	* patches/icedtea-hotspot-use-idx_t.patch,
+	* patches/icedtea-security-updates.patch:
+	Remove parts applied/changed in b39.
+	
 2008-11-07  Omair Majid  <omajid at redhat.com>
 
 	* patches/icedtea-jsoundhs.patch: Added two more diffs to remove all uses 
diff -r e61d84115155 -r 3c4aa7011748 Makefile.am
--- a/Makefile.am	Fri Nov 07 16:31:49 2008 -0500
+++ b/Makefile.am	Mon Nov 10 01:38:03 2008 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 23_oct_2008
-OPENJDK_DATE = 23_oct_2008
-OPENJDK_MD5SUM = 2893ceeae804ce4f7e268388afed3449
-OPENJDK_VERSION = b38
+OPENJDK_DATE = 06_nov_2008
+OPENJDK_MD5SUM = 57062779a3c844621865faef8d423ad9
+OPENJDK_VERSION = b39
 
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8
diff -r e61d84115155 -r 3c4aa7011748 patches/icedtea-hotspot-use-idx_t.patch
--- a/patches/icedtea-hotspot-use-idx_t.patch	Fri Nov 07 16:31:49 2008 -0500
+++ b/patches/icedtea-hotspot-use-idx_t.patch	Mon Nov 10 01:38:03 2008 +0000
@@ -1,65 +1,9 @@
---- openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp.orig	2008-07-10 22:04:33.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.hpp	2008-08-14 23:08:36.000000000 +0200
-@@ -341,7 +341,7 @@
-   BasicBlock *    _basic_blocks;             // Array of basicblock info
-   int             _gc_points;
-   int             _bb_count;
--  uintptr_t *     _bb_hdr_bits;
-+  size_t *     _bb_hdr_bits;
+diff -Nru openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp
+--- openjdk.orig/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-11-06 08:40:55.000000000 +0000
++++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-11-10 00:55:09.000000000 +0000
+@@ -567,15 +567,15 @@
  
-   // Basicblocks methods
-   void          initialize_bb               ();
---- openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp.orig	2008-08-14 22:58:36.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/oops/generateOopMap.cpp	2008-08-14 23:03:33.000000000 +0200
-@@ -374,19 +374,19 @@
-   _gc_points = 0;
-   _bb_count  = 0;    
-   int size = binsToHold(method()->code_size());
--  _bb_hdr_bits = NEW_RESOURCE_ARRAY(uintptr_t,size);
--  memset(_bb_hdr_bits, 0, size*sizeof(uintptr_t));
-+  _bb_hdr_bits = NEW_RESOURCE_ARRAY(size_t,size);
-+  memset(_bb_hdr_bits, 0, size*sizeof(size_t));
- }
-  
- void GenerateOopMap ::set_bbmark_bit(int bci) {
-   int idx  = bci >> LogBitsPerWord;
--  uintptr_t bit = (uintptr_t)1 << (bci & (BitsPerWord-1));
-+  size_t bit = (size_t)1 << (bci & (BitsPerWord-1));
-   _bb_hdr_bits[idx] |= bit;
- }
  
- void GenerateOopMap ::clear_bbmark_bit(int bci) {
-   int idx   = bci >> LogBitsPerWord;
--  uintptr_t bit = (uintptr_t)1 << (bci & (BitsPerWord-1));
-+  size_t bit = (size_t)1 << (bci & (BitsPerWord-1));
-   _bb_hdr_bits[idx] &= (~bit);
- }
- 
-@@ -1027,7 +1027,7 @@
-          "new method size is too small");
-   int newWords = binsToHold(new_method_size);
- 
--  uintptr_t * new_bb_hdr_bits = NEW_RESOURCE_ARRAY(uintptr_t, newWords);
-+  size_t * new_bb_hdr_bits = NEW_RESOURCE_ARRAY(size_t, newWords);
- 
-   BitMap bb_bits(new_bb_hdr_bits, new_method_size);
-   bb_bits.clear();
---- openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp.orig	2008-07-10 22:04:31.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp	2008-08-14 22:59:30.000000000 +0200
-@@ -6162,7 +6162,7 @@
-   }
-   assert(_virtual_space.committed_size() == brs.size(),
-          "didn't reserve backing store for all of CMS bit map?");
--  _bm.set_map((uintptr_t*)_virtual_space.low());
-+  _bm.set_map((size_t*)_virtual_space.low());
-   assert(_virtual_space.committed_size() << (_shifter + LogBitsPerByte) >=
-          _bmWordSize, "inconsistency in bit map sizing");
-   _bm.set_size(_bmWordSize >> _shifter);
---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp.orig	2008-07-10 22:04:30.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.cpp	2008-08-14 22:59:30.000000000 +0200
-@@ -569,15 +569,15 @@
- 
-     
  MethodLiveness::BasicBlock::BasicBlock(MethodLiveness *analyzer, int start, int limit) :
 -         _gen((uintptr_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
 +         _gen((size_t*)analyzer->arena()->Amalloc(BytesPerWord * analyzer->bit_map_size_words()),
@@ -78,7 +22,7 @@
                           analyzer->bit_map_size_bits()),
           _last_bci(-1) {
    _analyzer = analyzer;
-@@ -994,7 +994,7 @@
+@@ -992,7 +992,7 @@
  }
  
  MethodLivenessResult MethodLiveness::BasicBlock::get_liveness_at(ciMethod* method, int bci) {
@@ -87,196 +31,15 @@
                  _analyzer->bit_map_size_bits());
    answer.set_is_valid();
  
---- openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp.orig	2008-07-10 22:04:30.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/compiler/methodLiveness.hpp	2008-08-14 22:59:30.000000000 +0200
-@@ -32,7 +32,7 @@
-   bool _is_valid;
- 
-  public:
--  MethodLivenessResult(uintptr_t* map, idx_t size_in_bits)
-+  MethodLivenessResult(idx_t* map, idx_t size_in_bits)
-     : BitMap(map, size_in_bits)
-     , _is_valid(false)
-   {}
---- openjdk/hotspot/src/share/vm/utilities/bitMap.cpp.orig	2008-07-10 22:04:37.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/bitMap.cpp	2008-08-14 23:06:51.000000000 +0200
-@@ -46,7 +46,7 @@
- void BitMap::resize(idx_t size_in_bits) {
-   assert(size_in_bits >= 0, "just checking");
-   size_t old_size_in_words = size_in_words();
--  uintptr_t* old_map = map();
-+  idx_t* old_map = map();
-   _size = size_in_bits;
-   size_t new_size_in_words = size_in_words();
-   _map = NEW_RESOURCE_ARRAY(idx_t, new_size_in_words);
-@@ -109,11 +109,11 @@
- }
- 
- inline void BitMap::set_large_range_of_words(idx_t beg, idx_t end) {
--  memset(_map + beg, ~(unsigned char)0, (end - beg) * sizeof(uintptr_t));
-+  memset(_map + beg, ~(unsigned char)0, (end - beg) * sizeof(idx_t));
- }
- 
- inline void BitMap::clear_large_range_of_words(idx_t beg, idx_t end) {
--  memset(_map + beg, 0, (end - beg) * sizeof(uintptr_t));
-+  memset(_map + beg, 0, (end - beg) * sizeof(idx_t));
- }
- 
- inline BitMap::idx_t BitMap::word_index_round_up(idx_t bit) const {
-@@ -285,11 +285,11 @@
- 
- bool BitMap::contains(const BitMap other) const {
-   assert(size() == other.size(), "must have same size");
--  uintptr_t* dest_map = map();
--  uintptr_t* other_map = other.map();
-+  idx_t* dest_map = map();
-+  idx_t* other_map = other.map();
-   idx_t size = size_in_words();
-   for (idx_t index = 0; index < size_in_words(); index++) {
--    uintptr_t word_union = dest_map[index] | other_map[index];
-+    idx_t word_union = dest_map[index] | other_map[index];
-     // If this has more bits set than dest_map[index], then other is not a
-     // subset.
-     if (word_union != dest_map[index]) return false;
-@@ -299,8 +299,8 @@
- 
- bool BitMap::intersects(const BitMap other) const {
-   assert(size() == other.size(), "must have same size");
--  uintptr_t* dest_map = map();
--  uintptr_t* other_map = other.map();
-+  idx_t* dest_map = map();
-+  idx_t* other_map = other.map();
-   idx_t size = size_in_words();
-   for (idx_t index = 0; index < size_in_words(); index++) {
-     if ((dest_map[index] & other_map[index]) != 0) return true;
-@@ -411,24 +411,24 @@
- }
- 
- bool BitMap::is_full() const {
--  uintptr_t* word = map();
-+  idx_t* word = map();
-   idx_t rest = size();
-   for (; rest >= (idx_t) BitsPerWord; rest -= BitsPerWord) {
--    if (*word != (uintptr_t) AllBits) return false;
-+    if (*word != (idx_t) AllBits) return false;
-     word++;
-   }
--  return rest == 0 || (*word | ~right_n_bits((int)rest)) == (uintptr_t) AllBits;
-+  return rest == 0 || (*word | ~right_n_bits((int)rest)) == (idx_t) AllBits;
- }
- 
- 
- bool BitMap::is_empty() const {
--  uintptr_t* word = map();
-+  idx_t* word = map();
-   idx_t rest = size();
-   for (; rest >= (idx_t) BitsPerWord; rest -= BitsPerWord) {
--    if (*word != (uintptr_t) NoBits) return false;
-+    if (*word != (idx_t) NoBits) return false;
-     word++;
-   }
--  return rest == 0 || (*word & right_n_bits((int)rest)) == (uintptr_t) NoBits;
-+  return rest == 0 || (*word & right_n_bits((int)rest)) == (idx_t) NoBits;
- }
- 
- void BitMap::clear_large() {
-@@ -448,7 +448,7 @@
-        offset < rightOffset && index < endIndex;
-        offset = (++index) << LogBitsPerWord) {
-     idx_t rest = map(index) >> (offset & (BitsPerWord - 1));
--    for (; offset < rightOffset && rest != (uintptr_t)NoBits; offset++) {
-+    for (; offset < rightOffset && rest != (idx_t)NoBits; offset++) {
-       if (rest & 1) {
-         blk->do_bit(offset);
-         //  resample at each closure application
-@@ -481,7 +481,7 @@
-   // check bits including and to the _left_ of offset's position
-   idx_t pos = bit_in_word(res_offset);
-   idx_t res = map(index) >> pos;
--  if (res != (uintptr_t)NoBits) {
-+  if (res != (idx_t)NoBits) {
-     // find the position of the 1-bit
-     for (; !(res & 1); res_offset++) {
-       res = res >> 1;
-@@ -492,7 +492,7 @@
-   // skip over all word length 0-bit runs
-   for (index++; index < r_index; index++) {
-     res = map(index);
--    if (res != (uintptr_t)NoBits) {
-+    if (res != (idx_t)NoBits) {
-       // found a 1, return the offset
-       for (res_offset = index << LogBitsPerWord; !(res & 1);
-            res_offset++) {
-@@ -523,7 +523,7 @@
-   idx_t pos = res_offset & (BitsPerWord - 1);
-   idx_t res = (map(index) >> pos) | left_n_bits((int)pos);
- 
--  if (res != (uintptr_t)AllBits) {
-+  if (res != (idx_t)AllBits) {
-     // find the position of the 0-bit
-     for (; res & 1; res_offset++) {
-       res = res >> 1;
-@@ -534,7 +534,7 @@
-   // skip over all word length 1-bit runs
-   for (index++; index < r_index; index++) {
-     res = map(index);
--    if (res != (uintptr_t)AllBits) {
-+    if (res != (idx_t)AllBits) {
-       // found a 0, return the offset
-       for (res_offset = index << LogBitsPerWord; res & 1;
-            res_offset++) {
-@@ -561,7 +561,7 @@
- #endif
- 
- 
--BitMap2D::BitMap2D(uintptr_t* map, idx_t size_in_slots, idx_t bits_per_slot)
-+BitMap2D::BitMap2D(idx_t* map, idx_t size_in_slots, idx_t bits_per_slot)
-   : _bits_per_slot(bits_per_slot)
-   , _map(map, size_in_slots * bits_per_slot)
- {
---- openjdk/hotspot/src/share/vm/utilities/bitMap.hpp.orig	2008-07-10 22:04:37.000000000 +0200
-+++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp	2008-08-14 23:08:18.000000000 +0200
-@@ -35,7 +35,7 @@
- 
- 
- // Operations for bitmaps represented as arrays of unsigned 32- or 64-bit
--// integers (uintptr_t).
-+// integers (size_t).
- //
- // Bit offsets are numbered from 0 to size-1
- 
-@@ -82,7 +82,7 @@
+diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp openjdk/hotspot/src/share/vm/utilities/bitMap.hpp
+--- openjdk.orig/hotspot/src/share/vm/utilities/bitMap.hpp	2008-11-06 08:40:58.000000000 +0000
++++ openjdk/hotspot/src/share/vm/utilities/bitMap.hpp	2008-11-10 00:57:20.000000000 +0000
+@@ -73,7 +73,7 @@
  
    // Set a word to a specified value or to all ones; clear a word.
-   void set_word  (idx_t word, idx_t val) { _map[word] = val; }
+   void set_word  (idx_t word, bm_word_t val) { _map[word] = val; }
 -  void set_word  (idx_t word)            { set_word(word, ~(uintptr_t)0); }
 +  void set_word  (idx_t word)            { set_word(word, ~(idx_t)0); }
    void clear_word(idx_t word)            { _map[word] = 0; }
  
    // Utilities for ranges of bits.  Ranges are half-open [beg, end).
-@@ -313,7 +313,7 @@
- 
-  public:
-   // Construction. bits_per_slot must be greater than 0.
--  BitMap2D(uintptr_t* map, idx_t size_in_slots, idx_t bits_per_slot);
-+  BitMap2D(idx_t* map, idx_t size_in_slots, idx_t bits_per_slot);
- 
-   // Allocates necessary data structure in resource area. bits_per_slot must be greater than 0.
-   BitMap2D(idx_t size_in_slots, idx_t bits_per_slot);
-@@ -366,13 +366,13 @@
- 
- 
- inline void BitMap::set_range_of_words(idx_t beg, idx_t end) {
--  uintptr_t* map = _map;
--  for (idx_t i = beg; i < end; ++i) map[i] = ~(uintptr_t)0;
-+  idx_t* map = _map;
-+  for (idx_t i = beg; i < end; ++i) map[i] = ~(idx_t)0;
- }
- 
- 
- inline void BitMap::clear_range_of_words(idx_t beg, idx_t end) {
--  uintptr_t* map = _map;
-+  idx_t* map = _map;
-   for (idx_t i = beg; i < end; ++i) map[i] = 0;
- }
- 
diff -r e61d84115155 -r 3c4aa7011748 patches/icedtea-security-updates.patch
--- a/patches/icedtea-security-updates.patch	Fri Nov 07 16:31:49 2008 -0500
+++ b/patches/icedtea-security-updates.patch	Mon Nov 10 01:38:03 2008 +0000
@@ -1,154 +1,3 @@
---- /dev/null	Mon Jun  2 08:53:52 2008
-+++ openjdk/jdk/src/share/classes/sun/management/jmxremote/LocalRMIServerSocketFactory.java	Mon Jun  2 08:53:51 2008
-@@ -0,0 +1,110 @@
-+/*
-+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Sun designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Sun in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+package sun.management.jmxremote;
-+
-+import java.io.IOException;
-+import java.net.InetAddress;
-+import java.net.NetworkInterface;
-+import java.net.ServerSocket;
-+import java.net.Socket;
-+import java.net.SocketException;
-+import java.rmi.server.RMIServerSocketFactory;
-+import java.util.Enumeration;
-+
-+/**
-+ * This RMI server socket factory creates server sockets that
-+ * will only accept connection requests from clients running
-+ * on the host where the RMI remote objects have been exported.
-+ */
-+public final class LocalRMIServerSocketFactory implements RMIServerSocketFactory {
-+    /**
-+     * Creates a server socket that only accepts connection requests from
-+     * clients running on the host where the RMI remote objects have been
-+     * exported.
-+     */
-+    public ServerSocket createServerSocket(int port) throws IOException {
-+        return new ServerSocket(port) {
-+            @Override
-+            public Socket accept() throws IOException {
-+                Socket socket = super.accept();
-+                InetAddress remoteAddr = socket.getInetAddress();
-+                final String msg = "The server sockets created using the " +
-+                        "LocalRMIServerSocketFactory only accept connections " +
-+                        "from clients running on the host where the RMI " +
-+                        "remote objects have been exported.";
-+                // Retrieve all the network interfaces on this host.
-+                Enumeration<NetworkInterface> nis;
-+                try {
-+                    nis = NetworkInterface.getNetworkInterfaces();
-+                } catch (SocketException e) {
-+                    try {
-+                        socket.close();
-+                    } catch (IOException ioe) {
-+                        // Ignore...
-+                    }
-+                    throw new IOException(msg, e);
-+                }
-+                // Walk through the network interfaces to see
-+                // if any of them matches the client's address.
-+                // If true, then the client's address is local.
-+                while (nis.hasMoreElements()) {
-+                    NetworkInterface ni = nis.nextElement();
-+                    Enumeration<InetAddress> addrs = ni.getInetAddresses();
-+                    while (addrs.hasMoreElements()) {
-+                        InetAddress localAddr = addrs.nextElement();
-+                        if (localAddr.equals(remoteAddr)) {
-+                            return socket;
-+                        }
-+                    }
-+                }
-+                // The client's address is remote so refuse the connection.
-+                try {
-+                    socket.close();
-+                } catch (IOException ioe) {
-+                    // Ignore...
-+                }
-+                throw new IOException(msg);
-+            }
-+        };
-+    }
-+
-+    /**
-+     * Two LocalRMIServerSocketFactory objects
-+     * are equal if they are of the same type.
-+     */
-+    @Override
-+    public boolean equals(Object obj) {
-+        return (obj instanceof LocalRMIServerSocketFactory);
-+    }
-+
-+    /**
-+     * Returns a hash code value for this LocalRMIServerSocketFactory.
-+     */
-+    @Override
-+    public int hashCode() {
-+        return getClass().hashCode();
-+    }
-+}
---- old/src/share/lib/management/management.properties	Mon Jun  2 08:53:52 2008
-+++ openjdk/jdk/src/share/lib/management/management.properties	Mon Jun  2 08:53:52 2008
-@@ -82,7 +82,7 @@
- #
- # com.sun.management.snmp.interface=<InetAddress>
- #      Specifies the local interface on which the SNMP agent will bind.
--#      This is usefull when running on machines which have several
-+#      This is useful when running on machines which have several
- #      interfaces defined. It makes it possible to listen to a specific
- #      subnet accessible through that interface.
- #      Default for this property is "localhost".
-@@ -144,6 +144,26 @@
- #
- 
- #
-+# ########## RMI connector settings for local management ##########
-+#
-+# com.sun.management.jmxremote.local.only=true|false
-+#      Default for this property is true. (Case for true/false ignored)
-+#      If this property is specified as true then the local JMX RMI connector
-+#      server will only accept connection requests from clients running on
-+#      the host where the out-of-the-box JMX management agent is running.
-+#      In order to ensure backwards compatibility this property could be
-+#      set to false. However, deploying the local management agent in this
-+#      way is discouraged because the local JMX RMI connector server will
-+#      accept connection requests from any client either local or remote.
-+#      For remote management the remote JMX RMI connector server should
-+#      be used instead with authentication and SSL/TLS encryption enabled.
-+#
-+
-+# For allowing the local management agent accept local
-+# and remote connection requests use the following line
-+# com.sun.management.jmxremote.local.only=false
-+
-+#
- # ###################### RMI SSL #############################
- #
- # com.sun.management.jmxremote.ssl=true|false
 No differences encountered
 --- old/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Fri May 30 16:49:25 2008
 +++ openjdk/jaxp/src/share/classes/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java	Fri May 30 16:49:25 2008
@@ -905,42 +754,4 @@ No differences encountered
 +        System.out.println("Bye! Bye!");
 +    }
 +}
---- ConnectorBootstrap.java	2008-07-09 08:49:40.000000000 -0400
-+++ openjdk/jdk/src/share/classes/sun/management/jmxremote/ConnectorBootstrap.java	2008-07-09 08:51:44.000000000 -0400
-@@ -98,6 +98,7 @@
- 
-         public static final String PORT = "0";
-         public static final String CONFIG_FILE_NAME = "management.properties";
-+	public static final String USE_LOCAL_ONLY="true";
-         public static final String USE_SSL = "true";
-         public static final String USE_REGISTRY_SSL = "false";
-         public static final String USE_AUTHENTICATION = "true";
-@@ -115,6 +116,8 @@
-                 "com.sun.management.jmxremote.port";
-         public static final String CONFIG_FILE_NAME =
-                 "com.sun.management.config.file";
-+	public static final String USE_LOCAL_ONLY =
-+                "com.sun.management.jmxremote.local.only";
-         public static final String USE_SSL =
-                 "com.sun.management.jmxremote.ssl";
-         public static final String USE_REGISTRY_SSL =
-@@ -477,6 +480,19 @@
-         MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
-         try {
-             JMXServiceURL url = new JMXServiceURL("rmi", localhost, 0);
-+	    // Do we accept connections from local interfaces only?
-+            Properties props = Agent.getManagementProperties();
-+            if (props ==  null) {
-+                props = new Properties();


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 10 00:46:23 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 10 Nov 2008 08:46:23 +0000
Subject: [Bug 252] DaCapo xalan crashed on Zero ppc64
Message-ID: <E1KzSPf-0000B6-2g@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=252


gbenson at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|gbenson at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From twisti at complang.tuwien.ac.at  Mon Nov 10 03:03:59 2008
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 10 Nov 2008 12:03:59 +0100
Subject: changeset in /hg/icedtea6: 2008-10-27  Matthias Klose 
	<doko@ubu...
In-Reply-To: <hg.55a7a736bf3d.1225105544.2873452341184383832@icedtea.classpath.org>
References: <hg.55a7a736bf3d.1225105544.2873452341184383832@icedtea.classpath.org>
Message-ID: <1226315039.1171.7.camel@localhost.localdomain>

On Mon, 2008-10-27 at 11:05 +0000, doko at ubuntu.com wrote:
> -+  ifneq (,$(filter $(mach),mips s390 s390x))
> ++  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
>  +    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
>  +  endif
>     archExpr = case "$(mach)" in \
> @@ -20,13 +20,13 @@
>                   *) \
>                       echo $(mach) \
>                       ;; \

This patch breaks the build on powerpc, as the output of
dpkg-architecture is:

$ dpkg-architecture -qDEB_BUILD_ARCH_CPU
powerpc

This results in setting ARCH to powerpc and later in the build in:

-L/localtmp/cacao/jvmtester/work/b6-icedtea-zero/icedtea/build/bootstrap/jdk1.6.0/jre/lib/powerpc/ -ljvm 

/usr/bin/ld: cannot find -ljvm

Because the directory where libjvm.so lays is called jre/lib/ppc/.  Why
not simply adding cases for all architectures we support and not
depending on such utilities?

- Christian



From mark at klomp.org  Mon Nov 10 03:43:08 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 10 Nov 2008 11:43:08 +0000
Subject: changeset in /hg/icedtea6: Updated to new Gervill CVS.
Message-ID: <hg.cfe2c755ee47.1226317388.2873452341184383832@icedtea.classpath.org>

changeset cfe2c755ee47 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cfe2c755ee47
description:
	Updated to new Gervill CVS.

	- Fix: Throw IllegalArgumentException Exception on
	       invalid soundbank to:
	       SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
	       SoftSynthesizer.unloadInstruments(Soundbank soundbank, Patch[] patchList)
	       just like done in:
	       SoftSynthesizer.unloadInstrument(Instrument instrument).
	- Change: SoftMainMixer, SoftVoice optimized for mono voices.
	- Change: SoftFilter optimized.
	- Fix: Turn SoftJitterCorrector, SoftAudioPusher threads into a daemon threads.
	       These threads prevented the VM to exit when synthesizer was open.
	       See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213

	2008-11-10  Mark Wielaard  <mark at klomp.org>

		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
		CHANGES.txt,SoftAudioPusher.java,SoftFilter.java,
		SoftJitterCorrector.java,SoftMainMixer.java,SoftVoice.java:
		Updated to new Gervill CVS.

diffstat:

7 files changed, 107 insertions(+), 26 deletions(-)
ChangeLog                                                                           |    7 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt              |   15 ++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java     |    1 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java          |   22 ++-
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java |    1 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java       |   59 ++++++++--
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java           |   28 +++-

diffs (298 lines):

diff -r 688efd120766 -r cfe2c755ee47 ChangeLog
--- a/ChangeLog	Sun Nov 09 22:31:21 2008 +0100
+++ b/ChangeLog	Mon Nov 10 12:43:00 2008 +0100
@@ -1,3 +1,10 @@ 2008-11-09  Mark Wielaard  <mark at klomp.o
+2008-11-10  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
+	CHANGES.txt,SoftAudioPusher.java,SoftFilter.java,
+	SoftJitterCorrector.java,SoftMainMixer.java,SoftVoice.java:
+	Updated to new Gervill CVS.
+
 2008-11-09  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (check-langtools): Run jtreg with -samevm.
diff -r 688efd120766 -r cfe2c755ee47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt	Sun Nov 09 22:31:21 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt	Mon Nov 10 12:43:00 2008 +0100
@@ -1,3 +1,14 @@
+  - Fix: Throw IllegalArgumentException Exception on
+         invalid soundbank to:
+         SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
+         SoftSynthesizer.unloadInstruments(Soundbank soundbank, Patch[] patchList)
+         just like done in:
+         SoftSynthesizer.unloadInstrument(Instrument instrument).
+  - Change: SoftMainMixer, SoftVoice optimized for mono voices.
+  - Change: SoftFilter optimized. 
+  - Fix: Turn SoftJitterCorrector, SoftAudioPusher threads into a daemon threads.
+         These threads prevented the VM to exit when synthesizer was open.
+         See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213 
   - Add: More JTreg tests added:
            EmergencySoundbank
            SoftFilter
@@ -6,6 +17,8 @@
   - Fix: ModelByteBuffer.skip called super.skip
          instead to call to RandomAccessFile directly.
          JTreg tests added: ModelByteBuffer/RandomFileInputStream/*.java
+         
+Version 1.0.2 (released in OpenJDK 6 b12)   
   - Fix: ModelByteBuffer.len was being modified in inner
          class RandomFileInputStream. The variable was made final
          and RandomFileInputStream.read methods where fixed.
@@ -13,7 +26,7 @@
          Keys array was to small, it couldn't
          hold all possible midi notes (0..127).
 
-Version 1.0.1
+Version 1.0.1 (released as 1.0)
   - Fix: Created dummy SourceDataline so that following 
          jtreg test can be tested without using
          a real Audio Device SourceDataLine.  
diff -r 688efd120766 -r cfe2c755ee47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java	Sun Nov 09 22:31:21 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java	Mon Nov 10 12:43:00 2008 +0100
@@ -54,6 +54,7 @@ public class SoftAudioPusher implements 
             return;
         active = true;
         audiothread = new Thread(this);
+        audiothread.setDaemon(true);
         audiothread.setPriority(Thread.MAX_PRIORITY);
         audiothread.start();
     }
diff -r 688efd120766 -r cfe2c755ee47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java	Sun Nov 09 22:31:21 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java	Mon Nov 10 12:43:00 2008 +0100
@@ -543,8 +543,6 @@ public class SoftFilter {
 
     public void filter1(SoftAudioBuffer sbuffer) {
 
-        float[] buffer = sbuffer.array();
-
         if (dirty) {
             filter1calc();
             dirty = false;
@@ -559,6 +557,7 @@ public class SoftFilter {
 
         if (wet > 0 || last_wet > 0) {
 
+            float[] buffer = sbuffer.array();
             int len = buffer.length;
             float a0 = this.last_a0;
             float q = this.last_q;
@@ -577,14 +576,16 @@ public class SoftFilter {
                     q += q_delta;
                     gain += gain_delta;
                     wet += wet_delta;
-                    y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
-                    y2 = (1 - q * a0) * y2 + (a0) * y1;
+                    float ga0 = (1 - q * a0);
+                    y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
+                    y2 = ga0 * y2 + (a0) * y1;
                     buffer[i] = y2 * gain * wet + buffer[i] * (1 - wet);
                 }
             } else if (a0_delta == 0 && q_delta == 0) {
-                for (int i = 0; i < len; i++) {
-                    y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
-                    y2 = (1 - q * a0) * y2 + (a0) * y1;
+                float ga0 = (1 - q * a0);
+                for (int i = 0; i < len; i++) {
+                    y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
+                    y2 = ga0 * y2 + (a0) * y1;
                     buffer[i] = y2 * gain;
                 }
             } else {
@@ -592,8 +593,9 @@ public class SoftFilter {
                     a0 += a0_delta;
                     q += q_delta;
                     gain += gain_delta;
-                    y1 = (1 - q * a0) * y1 - (a0) * y2 + (a0) * buffer[i];
-                    y2 = (1 - q * a0) * y2 + (a0) * y1;
+                    float ga0 = (1 - q * a0);
+                    y1 = ga0 * y1 + (a0) * (buffer[i] - y2);
+                    y2 = ga0 * y2 + (a0) * y1;
                     buffer[i] = y2 * gain;
                 }
             }
@@ -611,4 +613,4 @@ public class SoftFilter {
         this.last_gain = this.gain;
         this.last_wet = this.wet;
     }
-}
+}
\ No newline at end of file
diff -r 688efd120766 -r cfe2c755ee47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java	Sun Nov 09 22:31:21 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java	Mon Nov 10 12:43:00 2008 +0100
@@ -216,6 +216,7 @@ public class SoftJitterCorrector extends
             };
 
             thread = new Thread(runnable);
+            thread.setDaemon(true);
             thread.setPriority(Thread.MAX_PRIORITY);
             thread.start();
         }
diff -r 688efd120766 -r cfe2c755ee47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java	Sun Nov 09 22:31:21 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java	Mon Nov 10 12:43:00 2008 +0100
@@ -48,16 +48,18 @@ public class SoftMainMixer {
 
     public final static int CHANNEL_LEFT = 0;
     public final static int CHANNEL_RIGHT = 1;
-    public final static int CHANNEL_EFFECT1 = 2;
-    public final static int CHANNEL_EFFECT2 = 3;
-    public final static int CHANNEL_EFFECT3 = 4;
-    public final static int CHANNEL_EFFECT4 = 5;
+    public final static int CHANNEL_MONO = 2;
+    public final static int CHANNEL_EFFECT1 = 3;
+    public final static int CHANNEL_EFFECT2 = 4;
+    public final static int CHANNEL_EFFECT3 = 5;
+    public final static int CHANNEL_EFFECT4 = 6;
     public final static int CHANNEL_LEFT_DRY = 10;
     public final static int CHANNEL_RIGHT_DRY = 11;
     public final static int CHANNEL_SCRATCH1 = 12;
     public final static int CHANNEL_SCRATCH2 = 13;
     public final static int CHANNEL_CHANNELMIXER_LEFT = 14;
     public final static int CHANNEL_CHANNELMIXER_RIGHT = 15;
+    public final static int CHANNEL_CHANNELMIXER_MONO = 16;
     protected boolean active_sensing_on = false;
     private long msec_last_activity = -1;
     private boolean pusher_silent = false;
@@ -485,8 +487,10 @@ public class SoftMainMixer {
             // to channelmixer left,right input/output
             SoftAudioBuffer leftbak = buffers[CHANNEL_LEFT];
             SoftAudioBuffer rightbak = buffers[CHANNEL_RIGHT];
+            SoftAudioBuffer monobak = buffers[CHANNEL_MONO];
             buffers[CHANNEL_LEFT] = buffers[CHANNEL_CHANNELMIXER_LEFT];
-            buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_LEFT];
+            buffers[CHANNEL_RIGHT] = buffers[CHANNEL_CHANNELMIXER_RIGHT];
+            buffers[CHANNEL_MONO] = buffers[CHANNEL_CHANNELMIXER_MONO];
 
             int bufferlen = buffers[CHANNEL_LEFT].getSize();
 
@@ -503,6 +507,7 @@ public class SoftMainMixer {
             for (ModelChannelMixer cmixer : act_registeredMixers) {
                 for (int i = 0; i < cbuffer.length; i++)
                     Arrays.fill(cbuffer[i], 0);
+                buffers[CHANNEL_MONO].clear();
                 boolean hasactivevoices = false;
                 for (int i = 0; i < voicestatus.length; i++)
                     if (voicestatus[i].active)
@@ -516,6 +521,26 @@ public class SoftMainMixer {
                         cur_registeredMixers = null;
                     }
                 }
+                
+                if(!buffers[CHANNEL_MONO].isSilent())
+                {
+                    float[] mono = buffers[CHANNEL_MONO].array();
+                    float[] left = buffers[CHANNEL_LEFT].array();            
+                    if (nrofchannels != 1) {
+                        float[] right = buffers[CHANNEL_RIGHT].array();
+                        for (int i = 0; i < bufferlen; i++) {
+                            float v = mono[i];
+                            left[i] += v;
+                            right[i] += v;
+                        }                
+                    }
+                    else
+                    {
+                        for (int i = 0; i < bufferlen; i++) {
+                            left[i] += mono[i];
+                        }                                
+                    }                              
+                }                
 
                 for (int i = 0; i < cbuffer.length; i++) {
                     float[] cbuff = cbuffer[i];
@@ -539,6 +564,7 @@ public class SoftMainMixer {
 
             buffers[CHANNEL_LEFT] = leftbak;
             buffers[CHANNEL_RIGHT] = rightbak;
+            buffers[CHANNEL_MONO] = monobak;
 
         }
 
@@ -546,6 +572,27 @@ public class SoftMainMixer {
             if (voicestatus[i].active)
                 if (voicestatus[i].channelmixer == null)
                     voicestatus[i].processAudioLogic(buffers);
+        
+        if(!buffers[CHANNEL_MONO].isSilent())
+        {
+            float[] mono = buffers[CHANNEL_MONO].array();
+            float[] left = buffers[CHANNEL_LEFT].array();            
+            int bufferlen = buffers[CHANNEL_LEFT].getSize();
+            if (nrofchannels != 1) {
+                float[] right = buffers[CHANNEL_RIGHT].array();
+                for (int i = 0; i < bufferlen; i++) {
+                    float v = mono[i];
+                    left[i] += v;
+                    right[i] += v;
+                }                
+            }
+            else
+            {
+                for (int i = 0; i < bufferlen; i++) {
+                    left[i] += mono[i];
+                }                                
+            }            
+        }
 
         // Run effects
         if (synth.chorus_on)
@@ -665,7 +712,7 @@ public class SoftMainMixer {
                                 / synth.getControlRate());
 
         control_mutex = synth.control_mutex;
-        buffers = new SoftAudioBuffer[16];
+        buffers = new SoftAudioBuffer[17];
         for (int i = 0; i < buffers.length; i++) {
             buffers[i] = new SoftAudioBuffer(buffersize, synth.getFormat());
         }
diff -r 688efd120766 -r cfe2c755ee47 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java
--- a/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java	Sun Nov 09 22:31:21 2008 +0100
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java	Mon Nov 10 12:43:00 2008 +0100
@@ -782,6 +782,7 @@ public class SoftVoice extends VoiceStat
 
         SoftAudioBuffer left = buffer[SoftMainMixer.CHANNEL_LEFT];
         SoftAudioBuffer right = buffer[SoftMainMixer.CHANNEL_RIGHT];
+        SoftAudioBuffer mono = buffer[SoftMainMixer.CHANNEL_MONO];
         SoftAudioBuffer eff1 = buffer[SoftMainMixer.CHANNEL_EFFECT1];
         SoftAudioBuffer eff2 = buffer[SoftMainMixer.CHANNEL_EFFECT2];
         SoftAudioBuffer leftdry = buffer[SoftMainMixer.CHANNEL_LEFT_DRY];
@@ -802,17 +803,26 @@ public class SoftVoice extends VoiceStat
             if (rightdry != null)
                 mixAudioStream(rightdry, left, last_out_mixer_left,
                         out_mixer_left);
-        } else {
-            mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left);
-            if (rightdry != null)
-                mixAudioStream(rightdry, right, last_out_mixer_right,
+        } else {            
+            if(rightdry == null && 
+                    last_out_mixer_left == last_out_mixer_right &&
+                    out_mixer_left == out_mixer_right)
+            {
+                mixAudioStream(leftdry, mono, last_out_mixer_left, out_mixer_left);
+            }
+            else
+            {
+                mixAudioStream(leftdry, left, last_out_mixer_left, out_mixer_left);
+                if (rightdry != null)
+                    mixAudioStream(rightdry, right, last_out_mixer_right,
                         out_mixer_right);
-            else
-                mixAudioStream(leftdry, right, last_out_mixer_right,
+                else
+                    mixAudioStream(leftdry, right, last_out_mixer_right,
                         out_mixer_right);
-        }
-
-        if (rightdry == null) {
+            }
+        }
+
+        if (rightdry == null) {            
             mixAudioStream(leftdry, eff1, last_out_mixer_effect1,
                     out_mixer_effect1);
             mixAudioStream(leftdry, eff2, last_out_mixer_effect2,


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 10 03:43:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 10 Nov 2008 11:43:49 +0000
Subject: [Bug 213] OpenJDK-6-jre freezes on simple midi app, sun JRE does not
Message-ID: <E1KzVBN-0000Kx-9k@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #3 from mark at klomp.org  2008-11-10 11:43 -------
# HG changeset patch
# User Mark Wielaard <mark at klomp.org>
# Date 1226317380 -3600
# Node ID cfe2c755ee47fb990a97c4d23691feb39d4a046d
# Parent  688efd12076603ef455dd2a0a70d3aecb3cfe589
Updated to new Gervill CVS.

- Fix: Throw IllegalArgumentException Exception on
       invalid soundbank to:
       SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
       SoftSynthesizer.unloadInstruments(Soundbank soundbank, Patch[]
patchList)
       just like done in:
       SoftSynthesizer.unloadInstrument(Instrument instrument).
- Change: SoftMainMixer, SoftVoice optimized for mono voices.
- Change: SoftFilter optimized.
- Fix: Turn SoftJitterCorrector, SoftAudioPusher threads into a daemon threads.
       These threads prevented the VM to exit when synthesizer was open.
       See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213

2008-11-10  Mark Wielaard  <mark at klomp.org>

        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
        CHANGES.txt,SoftAudioPusher.java,SoftFilter.java,
        SoftJitterCorrector.java,SoftMainMixer.java,SoftVoice.java:
        Updated to new Gervill CVS.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From omajid at redhat.com  Mon Nov 10 07:15:20 2008
From: omajid at redhat.com (Omair Majid)
Date: Mon, 10 Nov 2008 15:15:20 +0000
Subject: changeset in /hg/icedtea6: 2008-11-10  Omair Majid  <omajid@redh...
Message-ID: <hg.e7a4c496b2c0.1226330120.2873452341184383832@icedtea.classpath.org>

changeset e7a4c496b2c0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e7a4c496b2c0
description:
	2008-11-10  Omair Majid  <omajid at redhat.com>

	       * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
	       (Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1set_1sink_1volume):
	       Deallocate unused memory.

diffstat:

2 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog                                                          |    6 ++++++
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c |    3 ++-

diffs (26 lines):

diff -r cfe2c755ee47 -r e7a4c496b2c0 ChangeLog
--- a/ChangeLog	Mon Nov 10 12:43:00 2008 +0100
+++ b/ChangeLog	Mon Nov 10 10:15:16 2008 -0500
@@ -1,3 +1,9 @@ 2008-11-10  Mark Wielaard  <mark at klomp.o
+2008-11-10  Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
+	(Java_org_classpath_icedtea_pulseaudio_EventLoop_native_1set_1sink_1volume):
+	Deallocate unused memory.
+
 2008-11-10  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
diff -r cfe2c755ee47 -r e7a4c496b2c0 pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
--- a/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c	Mon Nov 10 12:43:00 2008 +0100
+++ b/pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c	Mon Nov 10 10:15:16 2008 -0500
@@ -356,7 +356,8 @@ JNIEXPORT void JNICALL Java_org_classpat
 	*new_volume = volume;
 
 	int stream_id = pa_stream_get_index(stream);
-	pa_context_get_sink_input_info(context, stream_id,sink_input_change_volume, new_volume);
+	pa_operation* o = pa_context_get_sink_input_info(context, stream_id,sink_input_change_volume, new_volume);
+	pa_operation_unref(o);
 	return;
 }
 


From omajid at redhat.com  Mon Nov 10 10:48:32 2008
From: omajid at redhat.com (Omair Majid)
Date: Mon, 10 Nov 2008 18:48:32 +0000
Subject: changeset in /hg/icedtea6: 2008-11-10  Omair Majid  <omajid@redh...
Message-ID: <hg.58f7eb173fe0.1226342912.2873452341184383832@icedtea.classpath.org>

changeset 58f7eb173fe0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=58f7eb173fe0
description:
	2008-11-10  Omair Majid  <omajid at redhat.com>

	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
	    (close): Dont check for permission to play audio. Always granted.
	    Infact, checking it causes an AccessControlException for untrusted
	    applets. The ALSA based backend doesnt check this permission at all.
	    (open): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
	    (getLine): Likewise.
	    (getSourceLines): Likewise.
	    (close): Likewise.
	    (open): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
	    (open): Likewise.
	    (close): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
	    (open): Likewise.
	    (close): Likewise

diffstat:

5 files changed, 29 insertions(+), 67 deletions(-)
ChangeLog                                                                          |   19 +++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java           |    9 --
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java          |   38 ----------
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java |   21 ++---
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java     |    9 --

diffs (239 lines):

diff -r e7a4c496b2c0 -r 58f7eb173fe0 ChangeLog
--- a/ChangeLog	Mon Nov 10 10:15:16 2008 -0500
+++ b/ChangeLog	Mon Nov 10 13:47:29 2008 -0500
@@ -1,3 +1,22 @@ 2008-11-10  Omair Majid  <omajid at redhat.
+2008-11-10  Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+	(close): Dont check for permission to play audio. Always granted.
+	Infact, checking it causes an AccessControlException for untrusted
+	applets. The ALSA based backend doesnt check this permission at all.
+	(open): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
+	(getLine): Likewise.
+	(getSourceLines): Likewise.
+	(close): Likewise.
+	(open): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(open): Likewise.
+	(close): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
+	(open): Likewise.
+	(close): Likewise.
+
 2008-11-10  Omair Majid  <omajid at redhat.com>
 
 	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c
diff -r e7a4c496b2c0 -r 58f7eb173fe0 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Mon Nov 10 10:15:16 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Mon Nov 10 13:47:29 2008 -0500
@@ -41,7 +41,6 @@ import java.io.IOException;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.AudioInputStream;
-import javax.sound.sampled.AudioPermission;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.Clip;
 import javax.sound.sampled.DataLine;
@@ -231,10 +230,6 @@ public class PulseAudioClip extends Puls
 	@Override
 	public void close() {
 
-		/* check for permission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
-
 		if (!isOpen) {
 			throw new IllegalStateException("line already closed");
 		}
@@ -396,10 +391,6 @@ public class PulseAudioClip extends Puls
 	@Override
 	public void open(AudioFormat format, byte[] data, int offset, int bufferSize)
 			throws LineUnavailableException {
-
-		/* check for permission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
 
 		super.open(format);
 		this.data = new byte[bufferSize];
diff -r e7a4c496b2c0 -r 58f7eb173fe0 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java	Mon Nov 10 10:15:16 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java	Mon Nov 10 13:47:29 2008 -0500
@@ -298,15 +298,11 @@ public class PulseAudioMixer implements 
 		}
 
 		if ((info.getLineClass() == SourceDataLine.class)) {
-			/* check for permission to play audio */
-			AudioPermission perm = new AudioPermission("play", null);
-			perm.checkGuard(null);
-
 			return new PulseAudioSourceDataLine(formats, defaultFormat);
 		}
 
 		if ((info.getLineClass() == TargetDataLine.class)) {
-			/* check for permission to play audio */
+			/* check for permission to record audio */
 			AudioPermission perm = new AudioPermission("record", null);
 			perm.checkGuard(null);
 
@@ -314,10 +310,6 @@ public class PulseAudioMixer implements 
 		}
 
 		if ((info.getLineClass() == Clip.class)) {
-			/* check for permission to play audio */
-			AudioPermission perm = new AudioPermission("play", null);
-			perm.checkGuard(null);
-
 			return new PulseAudioClip(formats, defaultFormat);
 		}
 
@@ -371,11 +363,6 @@ public class PulseAudioMixer implements 
 
 	@Override
 	public Line[] getSourceLines() {
-
-		/* check for permmission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
-
 		return (Line[]) sourceLines.toArray(new Line[0]);
 
 	}
@@ -401,7 +388,7 @@ public class PulseAudioMixer implements 
 	@Override
 	public Line[] getTargetLines() {
 
-		/* check for permission to play audio */
+		/* check for permission to record audio */
 		AudioPermission perm = new AudioPermission("record", null);
 		perm.checkGuard(null);
 
@@ -492,16 +479,6 @@ public class PulseAudioMixer implements 
 		 * is allowed
 		 */
 
-		try {
-			/* check for permission to play audio */
-			AudioPermission perm = new AudioPermission("play", null);
-			perm.checkGuard(null);
-		} catch (SecurityException e) {
-			/* check for permission to record audio */
-			AudioPermission perm = new AudioPermission("record", null);
-			perm.checkGuard(null);
-		}
-
 		if (!this.isOpen) {
 			throw new IllegalStateException("Mixer is not open; cant close");
 		}
@@ -616,16 +593,6 @@ public class PulseAudioMixer implements 
 		 * only allow the mixer to be controlled if either playback or recording
 		 * is allowed
 		 */
-
-		try {
-			/* check for permission to play audio */
-			AudioPermission perm = new AudioPermission("play", null);
-			perm.checkGuard(null);
-		} catch (SecurityException e) {
-			/* check for permission to record audio */
-			AudioPermission perm = new AudioPermission("record", null);
-			perm.checkGuard(null);
-		}
 
 		if (isOpen) {
 			throw new IllegalStateException("Mixer is already open");
@@ -738,7 +705,6 @@ public class PulseAudioMixer implements 
 	 * Cons: - eventListeners are run from other threads, if those then call
 	 * fireEvent while a method is waiting on a listener, this synchronized
 	 * block wont be entered: deadlock!
-	 * 
 	 */
 	private void fireEvent(final LineEvent e) {
 		synchronized (lineListeners) {
diff -r e7a4c496b2c0 -r 58f7eb173fe0 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Nov 10 10:15:16 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Nov 10 13:47:29 2008 -0500
@@ -68,10 +68,6 @@ public class PulseAudioSourceDataLine ex
 	synchronized public void open(AudioFormat format, int bufferSize)
 			throws LineUnavailableException {
 
-		/* check for permission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
-
 		super.open(format, bufferSize);
 
 		volumeControl = new PulseAudioVolumeControl(this, eventLoop);
@@ -154,11 +150,14 @@ public class PulseAudioSourceDataLine ex
 		}
 
 		if (offset < 0) {
-			throw new ArrayIndexOutOfBoundsException("offset is negative: " + offset);
-		}
-		
+			throw new ArrayIndexOutOfBoundsException("offset is negative: "
+					+ offset);
+		}
+
 		if (length + offset > data.length) {
-			throw new ArrayIndexOutOfBoundsException("writing data beyond the length of the array: " + (length + offset));
+			throw new ArrayIndexOutOfBoundsException(
+					"writing data beyond the length of the array: "
+							+ (length + offset));
 		}
 
 		int position = offset;
@@ -318,10 +317,6 @@ public class PulseAudioSourceDataLine ex
 	@Override
 	synchronized public void close() {
 
-		/* check for permmission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
-
 		if (!isOpen) {
 			throw new IllegalStateException("not open so cant close");
 		}
@@ -333,7 +328,7 @@ public class PulseAudioSourceDataLine ex
 
 		super.close();
 	}
-	
+
 	public javax.sound.sampled.Line.Info getLineInfo() {
 		return new DataLine.Info(SourceDataLine.class, supportedFormats,
 				StreamBufferAttributes.MIN_VALUE,
diff -r e7a4c496b2c0 -r 58f7eb173fe0 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java	Mon Nov 10 10:15:16 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java	Mon Nov 10 13:47:29 2008 -0500
@@ -37,7 +37,6 @@ exception statement from your version.
 
 package org.classpath.icedtea.pulseaudio;
 
-import javax.sound.sampled.AudioPermission;
 import javax.sound.sampled.Port;
 
 public class PulseAudioTargetPort extends PulseAudioPort {
@@ -55,10 +54,6 @@ public class PulseAudioTargetPort extend
 
 	public void open() {
 
-		/* check for permission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
-
 		super.open();
 
 		PulseAudioMixer parent = PulseAudioMixer.getInstance();
@@ -66,10 +61,6 @@ public class PulseAudioTargetPort extend
 	}
 
 	public void close() {
-
-		/* check for permission to play audio */
-		AudioPermission perm = new AudioPermission("play", null);
-		perm.checkGuard(null);
 
 		if (!isOpen) {
 			throw new IllegalStateException("not open, so cant close Port");


From twisti at complang.tuwien.ac.at  Mon Nov 10 10:44:58 2008
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 10 Nov 2008 19:44:58 +0100
Subject: changeset in /hg/icedtea6: 2008-10-27  Matthias Klose 
	<doko@ubu...
In-Reply-To: <hg.55a7a736bf3d.1225105544.2873452341184383832@icedtea.classpath.org>
References: <hg.55a7a736bf3d.1225105544.2873452341184383832@icedtea.classpath.org>
Message-ID: <1226342698.821.0.camel@localhost.localdomain>

On Mon, 2008-10-27 at 11:05 +0000, doko at ubuntu.com wrote:
> -+  ifneq (,$(filter $(mach),mips s390 s390x))
> ++  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
>  +    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
>  +  endif
>     archExpr = case "$(mach)" in \
> @@ -20,13 +20,13 @@
>                   *) \
>                       echo $(mach) \
>                       ;; \

This patch breaks the build on powerpc, as the output of
dpkg-architecture is:

$ dpkg-architecture -qDEB_BUILD_ARCH_CPU
powerpc

This results in setting ARCH to powerpc and later in the build in:

-L/localtmp/cacao/jvmtester/work/b6-icedtea-zero/icedtea/build/bootstrap/jdk1.6.0/jre/lib/powerpc/ -ljvm 

/usr/bin/ld: cannot find -ljvm

Because the directory where libjvm.so lays is called jre/lib/ppc/.  Why
not simply adding cases for all architectures we support and not
depending on such utilities?

- Christian



From omajid at redhat.com  Mon Nov 10 13:35:37 2008
From: omajid at redhat.com (Omair Majid)
Date: Mon, 10 Nov 2008 21:35:37 +0000
Subject: changeset in /hg/icedtea6: 2008-11-10  Omair Majid  <omajid@redh...
Message-ID: <hg.92b3adc8a186.1226352937.2873452341184383832@icedtea.classpath.org>

changeset 92b3adc8a186 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=92b3adc8a186
description:
	2008-11-10  Omair Majid  <omajid at redhat.com>

	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
	    New class containing debugging functions.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
	    (run): Print some debugging info.
	    (update): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
	    (ClipThread.writeFrames): Likewise.
	    (close): Likewise.
	    (open): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
	    (PulseAudioMixer): Likewise.
	    (getLine): Likewise.
	    (close): Likewise.
	    (open): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java
	    (PulseAudioMixerProvider): Initialize Debug class.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
	    (open): Print some debug info.
	    (close): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
	    (open): Likewise.
	    (close): Likewise.

diffstat:

8 files changed, 196 insertions(+), 16 deletions(-)
ChangeLog                                                                          |   25 ++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java                    |  104 ++++++++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java                |   15 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java           |    8 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java          |   38 ++-
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java  |    4 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java |   10 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java |    8 

diffs (454 lines):

diff -r 58f7eb173fe0 -r 92b3adc8a186 ChangeLog
--- a/ChangeLog	Mon Nov 10 13:47:29 2008 -0500
+++ b/ChangeLog	Mon Nov 10 14:48:22 2008 -0500
@@ -1,3 +1,28 @@ 2008-11-10  Omair Majid  <omajid at redhat.
+2008-11-10  Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
+	New class containing debugging functions.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
+	(run): Print some debugging info.
+	(update): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
+	(ClipThread.writeFrames): Likewise.
+	(close): Likewise.
+	(open): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
+	(PulseAudioMixer): Likewise.
+	(getLine): Likewise.
+	(close): Likewise.
+	(open): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java
+	(PulseAudioMixerProvider): Initialize Debug class.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
+	(open): Print some debug info.
+	(close): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
+	(open): Likewise.
+	(close): Likewise.
+
 2008-11-10  Omair Majid  <omajid at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java	Mon Nov 10 14:48:22 2008 -0500
@@ -0,0 +1,104 @@
+/* EventLoop.java
+   Copyright (C) 2008 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 org.classpath.icedtea.pulseaudio;
+
+public class Debug {
+
+	public enum DebugLevel {
+		Verbose, Debug, Info, Warning, Error, None
+	}
+
+	private static DebugLevel currentDebugLevel = DebugLevel.None;
+
+	public static void initialize() {
+		// System.out.println("PulseAudio: initializing Debug");
+
+		String systemSetting;
+		try {
+			systemSetting = System.getProperty("pulseaudio.debugLevel");
+		} catch (SecurityException e) {
+			// sigh, we cant read that property
+			systemSetting = null;
+		}
+
+		DebugLevel wantedLevel;
+		try {
+			wantedLevel = DebugLevel.valueOf(systemSetting);
+
+		} catch (IllegalArgumentException e) {
+			wantedLevel = DebugLevel.Info;
+		} catch (NullPointerException e) {
+			wantedLevel = DebugLevel.None;
+		}
+
+		currentDebugLevel = wantedLevel;
+		println(DebugLevel.Info, "Using debug level: " + currentDebugLevel);
+	}
+
+	public static void println(String string) {
+		println(DebugLevel.Info, string);
+	}
+
+	public static void print(DebugLevel level, String string) {
+		int result = level.compareTo(currentDebugLevel);
+		if (result >= 0) {
+			if (level.compareTo(DebugLevel.Error) >= 0) {
+				System.err.print(string);
+			} else {
+				System.out.print(string);
+			}
+		} else {
+			// do nothing
+		}
+	}
+
+	public static void println(DebugLevel level, String string) {
+
+		int result = level.compareTo(currentDebugLevel);
+		if (result >= 0) {
+			if (level.compareTo(DebugLevel.Error) >= 0) {
+				System.err.println("DEBUG: pulse-java: " + string);
+			} else {
+				System.out.println("DEBUG: pulse-java: " + string);
+			}
+		} else {
+			// do nothing
+		}
+	}
+
+}
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java	Mon Nov 10 13:47:29 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java	Mon Nov 10 14:48:22 2008 -0500
@@ -42,6 +42,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.Semaphore;
 
 import org.classpath.icedtea.pulseaudio.ContextEvent.Type;
+import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
 
 /*
  * any methods that can obstruct the behaviour of pa_mainloop should run
@@ -55,7 +56,6 @@ public class EventLoop implements Runnab
 	/*
 	 * the threadLock object is the object used for synchronizing the
 	 * non-thread-safe operations of pulseaudio's c api
-	 * 
 	 */
 	public Object threadLock = new Object();
 
@@ -79,7 +79,6 @@ public class EventLoop implements Runnab
 	 * 
 	 * Do not synchronize the individual functions, synchronize
 	 * block/method/lines around the call
-	 * 
 	 */
 
 	private native void native_setup(String appName, String server);
@@ -92,8 +91,6 @@ public class EventLoop implements Runnab
 
 	/*
 	 * These fields hold pointers
-	 * 
-	 * 
 	 */
 	@SuppressWarnings("unused")
 	private byte[] contextPointer;
@@ -131,6 +128,8 @@ public class EventLoop implements Runnab
 	@Override
 	public void run() {
 		native_setup(this.name, this.serverString);
+
+		Debug.println(DebugLevel.Info, "Eventloop.run(): eventloop starting");
 
 		/*
 		 * Perhaps this loop should be written in C doing a Java to C call on
@@ -144,13 +143,14 @@ public class EventLoop implements Runnab
 
 				if (Thread.interrupted()) {
 					native_shutdown();
-					// System.out.println(this.getClass().getName()
-					// + ": shutting down");
 
 					// clean up the listeners
 					synchronized (contextListeners) {
 						contextListeners.clear();
 					}
+
+					Debug.println(DebugLevel.Info,
+							"EventLoop.run(): event loop terminated");
 
 					return;
 
@@ -197,7 +197,8 @@ public class EventLoop implements Runnab
 				break;
 			case 5:
 				fireEvent(new ContextEvent(Type.FAILED));
-				System.out.println("context failed");
+				Debug.println(DebugLevel.Warning,
+						"EventLoop.update(): Context failed");
 				break;
 			case 6:
 				fireEvent(new ContextEvent(Type.TERMINATED));
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Mon Nov 10 13:47:29 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java	Mon Nov 10 14:48:22 2008 -0500
@@ -46,6 +46,7 @@ import javax.sound.sampled.DataLine;
 import javax.sound.sampled.DataLine;
 import javax.sound.sampled.LineUnavailableException;
 
+import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
 import org.classpath.icedtea.pulseaudio.Stream.WriteListener;
 
 public class PulseAudioClip extends PulseAudioDataLine implements Clip,
@@ -144,6 +145,9 @@ public class PulseAudioClip extends Puls
 		};
 
 		stream.addWriteListener(writeListener);
+
+		Debug.println(DebugLevel.Verbose,
+				"PulseAudioClip$ClipThread.writeFrames(): Writing");
 
 		int remainingFrames = lastFrame - startingFrame - 1;
 		while (remainingFrames > 0) {
@@ -250,6 +254,9 @@ public class PulseAudioClip extends Puls
 
 		super.close();
 
+		Debug.println(DebugLevel.Verbose, "PulseAudioClip.close(): "
+				+ "Clip closed");
+
 	}
 
 	/*
@@ -416,6 +423,7 @@ public class PulseAudioClip extends Puls
 		mixer.addSourceLine(this);
 
 		isOpen = true;
+		Debug.println(DebugLevel.Verbose, "PulseAudioClip.open(): Clip opened");
 
 	}
 
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java	Mon Nov 10 13:47:29 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java	Mon Nov 10 14:48:22 2008 -0500
@@ -67,6 +67,8 @@ import javax.sound.sampled.AudioFormat.E
 import javax.sound.sampled.AudioFormat.Encoding;
 import javax.sound.sampled.Control.Type;
 
+import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
+
 public class PulseAudioMixer implements javax.sound.sampled.Mixer {
 	// singleton
 
@@ -92,6 +94,10 @@ public class PulseAudioMixer implements 
 	private final List<LineListener> lineListeners = new ArrayList<LineListener>();
 
 	private PulseAudioMixer() {
+
+		Debug.println(DebugLevel.Verbose, "PulseAudioMixer.PulseAudioMixer(): "
+				+ "Contructing PulseAudioMixer...");
+
 		AudioFormat[] formats = getSupportedFormats();
 
 		staticSourceLineInfos.add(new DataLine.Info(SourceDataLine.class,
@@ -107,6 +113,9 @@ public class PulseAudioMixer implements 
 
 		refreshSourceAndTargetLines();
 
+		Debug.println(DebugLevel.Verbose, "PulseAudioMixer.PulseAudioMixer(): "
+				+ "Finished constructing PulseAudioMixer");
+
 	}
 
 	synchronized public static PulseAudioMixer getInstance() {
@@ -126,7 +135,9 @@ public class PulseAudioMixer implements 
 		 * frameSize = sample size (in bytes, not bits) x # of channels
 		 * 
 		 * From PulseAudio's sources
-		 * http://git.0pointer.de/?p=pulseaudio.git;a=blob;f=src/pulse/sample.c;h=93da2465f4301e27af4976e82737c3a048124a68;hb=82ea8dde8abc51165a781c69bc3b38034d62d969#l63
+		 * http://git.0pointer.de/?p=pulseaudio.git;a=blob
+		 * ;f=src/pulse/sample.c;h=93da2465f4301e27af4976e82737c3a048124a68;hb=
+		 * 82ea8dde8abc51165a781c69bc3b38034d62d969#l63
 		 */
 
 		/*
@@ -135,7 +146,6 @@ public class PulseAudioMixer implements 
 		 * 
 		 * PA_CHANNEL_MAP_DEFAULT (=PA_CHANNEL_MAP_AIFF) supports 1,2,3,4,5 or 6
 		 * channels only
-		 * 
 		 */
 		int[] channelSizes = new int[] { 1, 2, 3, 4, 5, 6 };
 
@@ -321,6 +331,9 @@ public class PulseAudioMixer implements 
 				return new PulseAudioTargetPort(portInfo.getName());
 			}
 		}
+
+		Debug.println(DebugLevel.Info, "PulseAudioMixer.getLine(): "
+				+ "No matching line supported by PulseAudio");
 
 		throw new IllegalArgumentException("No matching lines found");
 
@@ -486,11 +499,14 @@ public class PulseAudioMixer implements 
 		List<Line> linesToClose = new LinkedList<Line>();
 		linesToClose.addAll(sourceLines);
 		if (sourceLines.size() > 0) {
+
+			Debug.println(DebugLevel.Warning, "PulseAudioMixer.close(): "
+					+ linesToClose.size()
+					+ " source lines were not closed. closing them now.");
+
 			linesToClose.addAll(sourceLines);
 			for (Line line : linesToClose) {
 				if (line.isOpen()) {
-					System.out
-							.println("PulseAudioMixer: DEBUG: some source lines have not been closed");
 					line.close();
 				}
 			}
@@ -498,11 +514,13 @@ public class PulseAudioMixer implements 
 		linesToClose.clear();
 
 		if (targetLines.size() > 0) {
+			Debug.println(DebugLevel.Warning, "PulseAudioMixer.close(): "
+					+ linesToClose.size()
+					+ " target lines have not been closed");
+
 			linesToClose.addAll(targetLines);
 			for (Line line : linesToClose) {
 				if (line.isOpen()) {
-					System.out
-							.println("PulseAudioMixer: DEBUG: some target lines have not been closed");
 					line.close();
 				}
 			}
@@ -521,11 +539,12 @@ public class PulseAudioMixer implements 
 					+ ": interrupted while waiting for eventloop to finish");
 		}
 
-		// System.out.println(this.getClass().getName() + ": closed");
-
 		isOpen = false;
 
 		refreshSourceAndTargetLines();
+
+		Debug.println(DebugLevel.Verbose, "PulseAudioMixer.close(): "
+				+ "Mixer closed");
 
 	}
 
@@ -691,6 +710,9 @@ public class PulseAudioMixer implements 
 			targetLineInfos.add(new Port.Info(Port.class, portName, false));
 		}
 
+		Debug.println(DebugLevel.Debug, "PulseAudioMixer.open(): "
+				+ "Mixer opened");
+
 	}
 
 	@Override
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java	Mon Nov 10 13:47:29 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java	Mon Nov 10 14:48:22 2008 -0500
@@ -43,6 +43,10 @@ public class PulseAudioMixerProvider ext
 public class PulseAudioMixerProvider extends
 		javax.sound.sampled.spi.MixerProvider {
 
+	public PulseAudioMixerProvider() {
+		Debug.initialize();
+	}
+
 	@Override
 	public Mixer getMixer(Info info) {
 		// System.out.println("DEBUG: getMixer called");
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Nov 10 13:47:29 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java	Mon Nov 10 14:48:22 2008 -0500
@@ -41,10 +41,11 @@ import java.util.ArrayList;
 
 import javax.sound.sampled.AudioFormat;
 import javax.sound.sampled.DataLine;
-import javax.sound.sampled.AudioPermission;
 import javax.sound.sampled.LineListener;
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
+
+import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
 
 public class PulseAudioSourceDataLine extends PulseAudioDataLine implements
 		SourceDataLine, PulseAudioPlaybackLine {
@@ -77,6 +78,9 @@ public class PulseAudioSourceDataLine ex
 
 		PulseAudioMixer parentMixer = PulseAudioMixer.getInstance();
 		parentMixer.addSourceLine(this);
+
+		Debug.println(DebugLevel.Verbose, "PulseAudioSourceDataLine.open(): "
+				+ "line opened");
 
 	}
 
@@ -327,6 +331,10 @@ public class PulseAudioSourceDataLine ex
 		parent.removeSourceLine(this);
 
 		super.close();
+
+		Debug.println(DebugLevel.Verbose, "PulseAudioSourceDataLine.close():"
+				+ " line closed");
+
 	}
 
 	public javax.sound.sampled.Line.Info getLineInfo() {
diff -r 58f7eb173fe0 -r 92b3adc8a186 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	Mon Nov 10 13:47:29 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java	Mon Nov 10 14:48:22 2008 -0500
@@ -44,6 +44,8 @@ import javax.sound.sampled.LineUnavailab
 import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.TargetDataLine;
 
+import org.classpath.icedtea.pulseaudio.Debug.DebugLevel;
+
 public class PulseAudioTargetDataLine extends PulseAudioDataLine implements
 		TargetDataLine {
 
@@ -84,6 +86,9 @@ public class PulseAudioTargetDataLine ex
 		parentMixer.removeTargetLine(this);
 
 		super.close();
+
+		Debug.println(DebugLevel.Verbose, "PulseAudioTargetDataLine.close(): "
+				+ "Line closed");
 	}
 
 	@Override
@@ -107,6 +112,9 @@ public class PulseAudioTargetDataLine ex
 		/* add this open line to the mixer */
 		PulseAudioMixer parentMixer = PulseAudioMixer.getInstance();
 		parentMixer.addTargetLine(this);
+
+		Debug.println(DebugLevel.Verbose, "PulseAudioTargetDataLine.open(): "
+				+ "Line opened");
 	}
 
 	@Override


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 10 19:09:04 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 11 Nov 2008 03:09:04 +0000
Subject: [Bug 247] Linkage errors while building OpenJDK with shark and llvm
Message-ID: <E1Kzjcm-00011H-FA@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=247


evgueni.gordienko at motorola.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |INVALID




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From doko at ubuntu.com  Mon Nov 10 23:45:26 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Tue, 11 Nov 2008 07:45:26 +0000
Subject: changeset in /hg/icedtea6: 2008-11-11  Matthias Klose  <doko@ubu...
Message-ID: <hg.28203509220a.1226389526.2873452341184383832@icedtea.classpath.org>

changeset 28203509220a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=28203509220a
description:
	2008-11-11  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.

diffstat:

2 files changed, 6 insertions(+), 2 deletions(-)
ChangeLog                   |    4 ++++
patches/icedtea-uname.patch |    4 ++--

diffs (32 lines):

diff -r 92b3adc8a186 -r 28203509220a ChangeLog
--- a/ChangeLog	Mon Nov 10 14:48:22 2008 -0500
+++ b/ChangeLog	Tue Nov 11 08:45:14 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-10  Omair Majid  <omajid at redhat.
+2008-11-11  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.
+
 2008-11-10  Omair Majid  <omajid at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java
diff -r 92b3adc8a186 -r 28203509220a patches/icedtea-uname.patch
--- a/patches/icedtea-uname.patch	Mon Nov 10 14:48:22 2008 -0500
+++ b/patches/icedtea-uname.patch	Tue Nov 11 08:45:14 2008 +0100
@@ -5,7 +5,7 @@
    # Arch and OS name/version
    mach := $(shell uname -m)
 +  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-+    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
++    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/')
 +  endif
    archExpr = case "$(mach)" in \
                  i[3-9]86) \
@@ -27,7 +27,7 @@
    # Arch and OS name/version
    mach := $(shell uname -m)
 +  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
-+    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
++    mach := $(shell (dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/powerpc$$/ppc/')
 +  endif
    archExpr = case "$(mach)" in \
                  i[3-9]86) \


From doko at ubuntu.com  Tue Nov 11 00:08:29 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Tue, 11 Nov 2008 09:08:29 +0100
Subject: changeset in /hg/icedtea6: 2008-10-27 Matthias Klose <doko@ubu...
In-Reply-To: <1226313798.828.15.camel@localhost.localdomain>
References: <hg.55a7a736bf3d.1225105544.2873452341184383832@icedtea.classpath.org>
	<1226313798.828.15.camel@localhost.localdomain>
Message-ID: <49193D7D.2040906@ubuntu.com>

Christian Thalinger schrieb:
> On Mon, 2008-10-27 at 11:05 +0000, doko at ubuntu.com wrote:
>> -+  ifneq (,$(filter $(mach),mips s390 s390x))
>> ++  ifneq (,$(wildcard /usr/bin/dpkg-architecture))
>>  +    mach := $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU 2>/dev/null || echo $(mach))
>>  +  endif
>>     archExpr = case "$(mach)" in \
>> @@ -20,13 +20,13 @@
>>                   *) \
>>                       echo $(mach) \
>>                       ;; \
> 
> This patch breaks the build on powerpc, as the output of
> dpkg-architecture is:
> 
> $ dpkg-architecture -qDEB_BUILD_ARCH_CPU
> powerpc
> 
> This results in setting ARCH to powerpc and later in the build in:
> 
> -L/localtmp/cacao/jvmtester/work/b6-icedtea-zero/icedtea/build/bootstrap/jdk1.6.0/jre/lib/powerpc/ -ljvm 
> 
> /usr/bin/ld: cannot find -ljvm
> 
> Because the directory where libjvm.so lays is called jre/lib/ppc/.  Why
> not simply adding cases for all architectures we support and not
> depending on such utilities?

Why not simply removing the use of uname -m? Yes, I know that the current
approach is a hack, but some debian buildds are configured in such a way that
they don't set the linux32 personality (no, I don't want to argue why buildd
admins do this). I checked in a fix for the ppc/powerpc problem, but in the long
term this should be better fixed upstream. The upstream build already uses
-m32/-m64 explicitely to allow building in configurations where the default gcc
(without -mxx) is not the compiler you want to use.

  Matthias



From twisti at complang.tuwien.ac.at  Tue Nov 11 00:16:06 2008
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Tue, 11 Nov 2008 09:16:06 +0100
Subject: changeset in /hg/icedtea6: 2008-10-27  Matthias Klose 
	<doko@ubu...
In-Reply-To: <49193D7D.2040906@ubuntu.com>
References: <hg.55a7a736bf3d.1225105544.2873452341184383832@icedtea.classpath.org>
	<1226313798.828.15.camel@localhost.localdomain>
	<49193D7D.2040906@ubuntu.com>
Message-ID: <1226391366.989.17.camel@localhost.localdomain>

On Tue, 2008-11-11 at 09:08 +0100, Matthias Klose wrote:
> Why not simply removing the use of uname -m? Yes, I know that the current
> approach is a hack, but some debian buildds are configured in such a way that
> they don't set the linux32 personality (no, I don't want to argue why buildd
> admins do this). I checked in a fix for the ppc/powerpc problem, but in the long

Thanks.

> term this should be better fixed upstream. The upstream build already uses
> -m32/-m64 explicitely to allow building in configurations where the default gcc
> (without -mxx) is not the compiler you want to use.

I agree, I use that when building jdk7.

- Christian



From gbenson at redhat.com  Tue Nov 11 01:38:08 2008
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 11 Nov 2008 09:38:08 +0000
Subject: changeset in /hg/icedtea6: 2008-11-11  Gary Benson  <gbenson@red...
Message-ID: <hg.89e71b641b8e.1226396288.2873452341184383832@icedtea.classpath.org>

changeset 89e71b641b8e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=89e71b641b8e
description:
	2008-11-11  Gary Benson  <gbenson at redhat.com>

		* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
		(os::atomic_copy64): New method.
		* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
		(_Copy_conjoint_jlongs_atomic): Use the above.
		* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
		(OrderAccess::load_acquire): Likewise.
		(OrderAccess::release_store): Likewise.
		(OrderAccess::store_fence): Likewise.
		(OrderAccess::release_store_fence): Likewise.

diffstat:

4 files changed, 63 insertions(+), 23 deletions(-)
ChangeLog                                                                |   12 ++
ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp |   57 ++++++----
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp                 |    4 
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp                 |   13 ++

diffs (154 lines):

diff -r 28203509220a -r 89e71b641b8e ChangeLog
--- a/ChangeLog	Tue Nov 11 08:45:14 2008 +0100
+++ b/ChangeLog	Tue Nov 11 04:38:04 2008 -0500
@@ -1,3 +1,15 @@ 2008-11-11  Matthias Klose  <doko at ubuntu
+2008-11-11  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+	(os::atomic_copy64): New method.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(_Copy_conjoint_jlongs_atomic): Use the above.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
+	(OrderAccess::load_acquire): Likewise.
+	(OrderAccess::release_store): Likewise.
+	(OrderAccess::store_fence): Likewise.
+	(OrderAccess::release_store_fence): Likewise.
+	
 2008-11-11  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-uname.patch: Fix ARCH on powerpc-linux-gnu.
diff -r 28203509220a -r 89e71b641b8e ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp	Tue Nov 11 08:45:14 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp	Tue Nov 11 04:38:04 2008 -0500
@@ -46,13 +46,28 @@ inline jbyte    OrderAccess::load_acquir
 inline jbyte    OrderAccess::load_acquire(volatile jbyte*   p) { return *p; }
 inline jshort   OrderAccess::load_acquire(volatile jshort*  p) { return *p; }
 inline jint     OrderAccess::load_acquire(volatile jint*    p) { return *p; }
-inline jlong    OrderAccess::load_acquire(volatile jlong*   p) { return *p; }
+inline jlong    OrderAccess::load_acquire(volatile jlong*   p)
+{
+  jlong tmp;
+  os::atomic_copy64(p, &tmp);
+  return tmp;
+}
 inline jubyte   OrderAccess::load_acquire(volatile jubyte*  p) { return *p; }
 inline jushort  OrderAccess::load_acquire(volatile jushort* p) { return *p; }
 inline juint    OrderAccess::load_acquire(volatile juint*   p) { return *p; }
-inline julong   OrderAccess::load_acquire(volatile julong*  p) { return *p; }
+inline julong   OrderAccess::load_acquire(volatile julong*  p)
+{
+  julong tmp;
+  os::atomic_copy64(p, &tmp);
+  return tmp;
+}
 inline jfloat   OrderAccess::load_acquire(volatile jfloat*  p) { return *p; }
-inline jdouble  OrderAccess::load_acquire(volatile jdouble* p) { return *p; }
+inline jdouble  OrderAccess::load_acquire(volatile jdouble* p)
+{
+  jdouble tmp;
+  os::atomic_copy64(p, &tmp);
+  return tmp;
+}
 
 inline intptr_t OrderAccess::load_ptr_acquire(volatile intptr_t*   p) { return *p; }
 inline void*    OrderAccess::load_ptr_acquire(volatile void*       p) { return *(void* volatile *)p; }
@@ -61,13 +76,13 @@ inline void     OrderAccess::release_sto
 inline void     OrderAccess::release_store(volatile jbyte*   p, jbyte   v) { *p = v; }
 inline void     OrderAccess::release_store(volatile jshort*  p, jshort  v) { *p = v; }
 inline void     OrderAccess::release_store(volatile jint*    p, jint    v) { *p = v; }
-inline void     OrderAccess::release_store(volatile jlong*   p, jlong   v) { *p = v; }
+inline void     OrderAccess::release_store(volatile jlong*   p, jlong   v) { os::atomic_copy64(&v, p); }
 inline void     OrderAccess::release_store(volatile jubyte*  p, jubyte  v) { *p = v; }
 inline void     OrderAccess::release_store(volatile jushort* p, jushort v) { *p = v; }
 inline void     OrderAccess::release_store(volatile juint*   p, juint   v) { *p = v; }
-inline void     OrderAccess::release_store(volatile julong*  p, julong  v) { *p = v; }
+inline void     OrderAccess::release_store(volatile julong*  p, julong  v) { os::atomic_copy64(&v, p); }
 inline void     OrderAccess::release_store(volatile jfloat*  p, jfloat  v) { *p = v; }
-inline void     OrderAccess::release_store(volatile jdouble* p, jdouble v) { *p = v; }
+inline void     OrderAccess::release_store(volatile jdouble* p, jdouble v) { os::atomic_copy64(&v, p); }
 
 inline void     OrderAccess::release_store_ptr(volatile intptr_t* p, intptr_t v) { *p = v; }
 inline void     OrderAccess::release_store_ptr(volatile void*     p, void*    v) { *(void* volatile *)p = v; }
@@ -75,27 +90,27 @@ inline void     OrderAccess::store_fence
 inline void     OrderAccess::store_fence(jbyte*   p, jbyte   v) { *p = v; fence(); }
 inline void     OrderAccess::store_fence(jshort*  p, jshort  v) { *p = v; fence(); }
 inline void     OrderAccess::store_fence(jint*    p, jint    v) { *p = v; fence(); }
-inline void     OrderAccess::store_fence(jlong*   p, jlong   v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jlong*   p, jlong   v) { os::atomic_copy64(&v, p); fence(); }
 inline void     OrderAccess::store_fence(jubyte*  p, jubyte  v) { *p = v; fence(); }
 inline void     OrderAccess::store_fence(jushort* p, jushort v) { *p = v; fence(); }
 inline void     OrderAccess::store_fence(juint*   p, juint   v) { *p = v; fence(); }
-inline void     OrderAccess::store_fence(julong*  p, julong  v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(julong*  p, julong  v) { os::atomic_copy64(&v, p); fence(); }
 inline void     OrderAccess::store_fence(jfloat*  p, jfloat  v) { *p = v; fence(); }
-inline void     OrderAccess::store_fence(jdouble* p, jdouble v) { *p = v; fence(); }
+inline void     OrderAccess::store_fence(jdouble* p, jdouble v) { os::atomic_copy64(&v, p); fence(); }
 
 inline void     OrderAccess::store_ptr_fence(intptr_t* p, intptr_t v) { *p = v; fence(); }
 inline void     OrderAccess::store_ptr_fence(void**    p, void*    v) { *p = v; fence(); }
 
-inline void     OrderAccess::release_store_fence(volatile jbyte*   p, jbyte   v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jshort*  p, jshort  v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jint*    p, jint    v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jlong*   p, jlong   v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jubyte*  p, jubyte  v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jushort* p, jushort v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile juint*   p, juint   v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile julong*  p, julong  v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jfloat*  p, jfloat  v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { *p = v; fence(); }
+inline void     OrderAccess::release_store_fence(volatile jbyte*   p, jbyte   v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jshort*  p, jshort  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jint*    p, jint    v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jlong*   p, jlong   v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jubyte*  p, jubyte  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jushort* p, jushort v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile juint*   p, juint   v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile julong*  p, julong  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jfloat*  p, jfloat  v) { release_store(p, v); fence(); }
+inline void     OrderAccess::release_store_fence(volatile jdouble* p, jdouble v) { release_store(p, v); fence(); }
 
-inline void     OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
-inline void     OrderAccess::release_store_ptr_fence(volatile void*     p, void*    v) { *(void* volatile *)p = v; fence(); }
+inline void     OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { release_store_ptr(p, v); fence(); }
+inline void     OrderAccess::release_store_ptr_fence(volatile void*     p, void*    v) { release_store_ptr(p, v); fence(); }
diff -r 28203509220a -r 89e71b641b8e ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Nov 11 08:45:14 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Nov 11 04:38:04 2008 -0500
@@ -410,14 +410,14 @@ extern "C" {
     if (from > to) {
       jlong *end = from + count;
       while (from < end)
-        *(to++) = *(from++);
+        os::atomic_copy64(from++, to++);
     }
     else if (from < to) {
       jlong *end = from;
       from += count - 1;
       to   += count - 1;
       while (from >= end)
-        *(to--) = *(from--);
+        os::atomic_copy64(from--, to--);
     }
   }
 
diff -r 28203509220a -r 89e71b641b8e ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
--- a/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Tue Nov 11 08:45:14 2008 +0100
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Tue Nov 11 04:38:04 2008 -0500
@@ -29,3 +29,16 @@
   // Note: Currently only used in 64 bit Windows implementations
   static bool register_code_area(char *low, char *high) { return true; }
 
+  // Atomically copy 64 bits of data
+  static void atomic_copy64(volatile void *src, volatile void *dst)
+  {
+#if defined(PPC) && !defined(_LP64)
+    double tmp;
+    asm volatile ("lfd  %0, 0(%1)\n"
+                  "stfd %0, 0(%2)\n"
+                  : "=f"(tmp)
+                  : "b"(src), "b"(dst));
+#else
+    *(jlong *) dst = *(jlong *) src;
+#endif // PPC && !_LP64
+  }


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 11 21:29:29 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 05:29:29 +0000
Subject: [Bug 254] New: dancing dude not vertically aligned in applet area
Message-ID: <E1L08ID-0002hJ-7m@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=254

           Summary: dancing dude not vertically aligned in applet area
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: https://bugs.launchpad.net/bugs/296959
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: doko at ubuntu.com


see the attached image; the top of the animation is not visible. seen with
IcedTea6 tip from Nov 11.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 11 21:29:54 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 05:29:54 +0000
Subject: [Bug 254] dancing dude not vertically aligned in applet area
Message-ID: <E1L08Ic-0002hQ-V5@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=254





------- Comment #1 from doko at ubuntu.com  2008-11-12 05:29 -------
Created an attachment (id=138)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=138&action=view)
screenshot


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 11 21:50:47 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 05:50:47 +0000
Subject: [Bug 255] New: label display in swing ui elements needs
	(inappropriate) additional vertical space
Message-ID: <E1L08cp-0002im-J1@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=255

           Summary: label display in swing ui elements needs (inappropriate)
                    additional vertical space
           Product: IcedTea
           Version: unspecified
          Platform: PC
               URL: https://bugs.launchpad.net/bugs/255983
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: doko at ubuntu.com


icedtea6 tip from Nov 11.

Swing UI elements (lists, labels) have additional vertical space, some applets
user interfaces are therefore broken with openjdk. In contrast sun-java6-jre
works fine with tvbrowser and other applets. I attached a good and a bad
png-image. The java program to render the example is ugly but still useable
with openjdk but i think the error is shown clearly in comparison of the bad
openjdk.png with the good sun sun-java.png.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 11 21:52:08 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 05:52:08 +0000
Subject: [Bug 255] label display in swing ui elements needs (inappropriate)
	additional vertical space
Message-ID: <E1L08e8-0002it-J6@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=255





------- Comment #1 from doko at ubuntu.com  2008-11-12 05:52 -------
wrong: http://launchpadlibrarian.net/16636110/openjdk.png
ok: http://launchpadlibrarian.net/16636119/sun-java.png


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 11 21:52:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 05:52:49 +0000
Subject: [Bug 255] label display in swing ui elements needs (inappropriate)
	additional vertical space
Message-ID: <E1L08en-0002jA-UW@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=255





------- Comment #2 from doko at ubuntu.com  2008-11-12 05:52 -------
Created an attachment (id=139)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=139&action=view)
button example


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov 12 04:29:32 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 12:29:32 +0000
Subject: [Bug 254] dancing dude not vertically aligned in applet area
Message-ID: <E1L0Eqi-0003FZ-4y@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=254





------- Comment #2 from mark at klomp.org  2008-11-12 12:29 -------
Strange, for me the dancing dukes top is visible.
Both in the browser as in the appletviewer:
appletviewer http://java.com/en/download/help/testvm.xml


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov 12 04:34:38 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 12:34:38 +0000
Subject: [Bug 255] label display in swing ui elements needs (inappropriate)
	additional vertical space
Message-ID: <E1L0Eve-0003Fo-74@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=255





------- Comment #3 from mark at klomp.org  2008-11-12 12:34 -------
The attached example doesn't match the screenshots.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Wed Nov 12 05:21:35 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 12 Nov 2008 13:21:35 +0000
Subject: [Bug 255] label display in swing ui elements needs (inappropriate)
	additional vertical space
Message-ID: <E1L0Ff5-0003Ho-6i@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=255





------- Comment #4 from doko at ubuntu.com  2008-11-12 13:21 -------
here the screenshots for the simple example:

wrong (according to bug submitter):
    http://launchpadlibrarian.net/18495058/not-vertically-centered.png

my reproduced screenshot:
    http://launchpadlibrarian.net/18495770/Button.png

ok (with sun java)
    http://launchpadlibrarian.net/18497525/vertically-centered.png

rechecked (wrong) with openjdk by bug submitter:
    http://launchpadlibrarian.net/18556877/iso--8859-15-large-borders.png


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Wed Nov 12 15:04:53 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 13 Nov 2008 00:04:53 +0100
Subject: New Gervill CVS imported into IcedTea6
Message-ID: <1226531094.6866.13.camel@hermans.wildebeest.org>

Hi,

I updated the IcedTea6 Gervill overlay with current Gervill CVS.

Out current set of changes compared with upstream are now really minimal
(diff attached). It incorporates a couple of the fixes for the
unloadInstruments methods from icedtea. It also fixes an imported bug
reported against icedtea "freezes on simple midi app":
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213

Also since openjdk6 imported a newer Gervill and incorporated a couple
of the changes in the icedtea gervill not yet upstream, we are a bit
closer again. diff between icedtea6-openjdk6 attached. Some of this is
just reformatting changed done in the openjdk6 on the upstream sources.
Not included in the diff is the renaming/changes to the upstream tests
(most of which are similar to our and upstream tests, but repackaged and
slightly reformatted).

All jtreg tests, both the com/sun/media/sound ones from upstream, as the
older javax/sound/midi in openjdk6 (which are almost all a copy of the
upstream tests renamed into a different package) pass.
And you can run them with the new jtreg -s flag, which gives an enormous
speed boost! That is in 45 seconds. Compared to 4.5 minutes without -s.
Test results: passed: 475

2008-11-10  Mark Wielaard  <mark at klomp.org>

        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/
        CHANGES.txt,SoftAudioPusher.java,SoftFilter.java,
        SoftJitterCorrector.java,SoftMainMixer.java,SoftVoice.java:
        Updated to new Gervill CVS.

Changes to the icedtea overlays since last import attached.

The actual changes to Gervill since our last import:

- Fix: Throw IllegalArgumentException Exception on
       invalid soundbank to:
       SoftSynthesizer.unloadAllInstruments(Soundbank soundbank)
       SoftSynthesizer.unloadInstruments(Soundbank soundbank, Patch[] patchList)
       just like done in:
       SoftSynthesizer.unloadInstrument(Instrument instrument).
- Change: SoftMainMixer, SoftVoice optimized for mono voices.
- Change: SoftFilter optimized. 
- Fix: Turn SoftJitterCorrector, SoftAudioPusher threads into a daemon threads.
       These threads prevented the VM to exit when synthesizer was open.
       See: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=213 

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gervill-icedtea.diff
Type: text/x-patch
Size: 2643 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081113/d94ae201/gervill-icedtea.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-openjdk.diff
Type: text/x-patch
Size: 10415 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081113/d94ae201/icedtea-openjdk.diff 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gervill-overlay.patch
Type: text/x-patch
Size: 12746 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081113/d94ae201/gervill-overlay.patch 

From mark at klomp.org  Thu Nov 13 04:29:38 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 13 Nov 2008 13:29:38 +0100
Subject: Public open specs
In-Reply-To: <1225975749.4621.5.camel@dijkstra.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<48D0C79F.1080909@redhat.com>
	<20080917235155.GA10355@rivendell.middle-earth.co.uk>
	<20080918010821.GD10250@bamboo.destinee.acro.gen.nz>
	<loom.20080918T020345-276@post.gmane.org>
	<17c6771e0809180328s3aeacca4m8a3969ba2abf4c84@mail.gmail.com>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeest.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
Message-ID: <1226579378.4563.15.camel@dijkstra.wildebeest.org>

Hi Dalibor,

On Thu, 2008-11-06 at 13:49 +0100, Mark Wielaard wrote:
> On Thu, 2008-10-30 at 11:12 +0100, Mark Wielaard wrote:
> > On Tue, 2008-10-21 at 21:16 +0200, Mark Wielaard wrote:
> > > On Tue, 2008-10-14 at 19:55 +0200, Dalibor Topic wrote:
> > > > Not yet (outside the JSR spec document). The process bottleneck is
> > > > identified, working on a fix.
> > > 
> > > That is great! Any timelines for these process fixes to be cleared up?
> > > It has been a little funny that Sun is now producing GPLed code for the
> > > various JSRs they lead, but still publish the JSR specs themselves under
> > > terms that conflict (through the 2a-c restrictions) with the liberties
> > > granted by the GPL. I came up with the following list of JSRs that have
> > > a Sun lead and for which OpenJDK provides (prototype) GPL code, but
> > > which are published under non-free terms preventing others to also
> > > publish (independent) implementations or extend the OpenJDK provided
> > > ones:
> > > 
> > > JSR 105: XML Digital Signature APIs
> > > JSR 199: Java Compiler API
> > > JSR 202: JavaTM Class File Specification Update
> > > JSR 203: More New I/O APIs for the JavaTM Platform ("NIO.2")
> > > JSR 221: JDBC 4.0 API Specification
> > > JSR 222: Java Architecture for XML Binding (JAXB) 2.0
> > > JSR 223: Scripting for the Java Platform
> > > JSR 224: Java API for XML-Based Web Services (JAX-WS) 2.0
> > > JSR 250: Common Annotations for the Java Platform
> > > JSR 255: Java Management Extensions (JMX) Specification, version 2.0
> > > JSR 269: Pluggable Annotation Processing API
> > > JSR 270: Java SE 6 Release Contents
> > > JSR 277: Java Module System
> > > JSR 292: Supporting Dynamically Typed Languages on the Java Platform
> > > JSR 294: Improved Modularity Support in the Java Programming Language
> > > 
> > > Would be great to see all these specs finally liberated.
> > 
> > Any progress on the fix to the process bottlenecks so these Sun
> > controlled specs that are essential for OpenJDK can be freely and openly
> > published?
> 
> Ping?

So, any progress? It would be good to at least have the specs for the
active projects (nio2, modules, mlvm, etc) published freely and openly
if that is easier to accomplish on short notice before we liberate all
the other relevant specs.

Thanks,

Mark



From mark at klomp.org  Thu Nov 13 04:30:11 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 13 Nov 2008 13:30:11 +0100
Subject: [OpenJDK 2D-Dev] Bug in pisces Renderer (uninitialized crossings)
In-Reply-To: <1225791009.3320.4.camel@dijkstra.wildebeest.org>
References: <1225119212.3329.29.camel@dijkstra.wildebeest.org>
	<1225791009.3320.4.camel@dijkstra.wildebeest.org>
Message-ID: <1226579411.4563.17.camel@dijkstra.wildebeest.org>

Hi,

On Tue, 2008-11-04 at 10:30 +0100, Mark Wielaard wrote:
> If anybody would take a look at this fix that would be appreciated.

Anybody?

> On Mon, 2008-10-27 at 15:53 +0100, Mark Wielaard wrote:
> > There is a bug in the pisces Renderer in crossingListFinished(). Both
> > crossings and crossingIndices might not have been initialized, so have
> > to be checked for being null. They only get initialized if
> > setCrossingsExtents() was called earlier, which might not always be the
> > case when crossingListFinished() is called from _endRendering().
> > 
> > You can see this with for example this applet (you will need to have the
> > IcedTeaPlugin installed):
> > http://www.jroller.com/dgilbert/entry/jfreechart_and_jxlayer
> > The magnifying glass will not work, and you will get an exception:
> > Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
> >   at sun.java2d.pisces.Renderer.crossingListFinished(Renderer.java:778)
> >   at sun.java2d.pisces.Renderer._endRendering(Renderer.java:466)
> >   at sun.java2d.pisces.Renderer.endRendering(Renderer.java:478)
> >   at sun.java2d.pisces.PiscesRenderingEngine.getAATileGenerator(PiscesRenderingEngine.java:327)
> >   at sun.java2d.pipe.AAShapePipe.renderPath(AAShapePipe.java:93)
> >   at sun.java2d.pipe.AAShapePipe.fill(AAShapePipe.java:65)
> >   at sun.java2d.pipe.ValidatePipe.fill(ValidatePipe.java:160)
> >   at sun.java2d.SunGraphics2D.fill(SunGraphics2D.java:2422)
> >   at org.jfree.chart.plot.Plot.fillBackground(Plot.java:1021)
> > [...]
> > 
> > Attached is the workaround that I checked into IcedTea to make this work
> > reliably:
> > 
> > 2008-10-27  Mark Wielaard  <mark at klomp.org>
> > 
> >         * patches/icedtea-renderer-crossing.patch: New patch.
> >         * Makefile.am (ICEDTEA_PATCHES): Add new patch.
> >         * HACKING: Document new patch.
> > 
> > Cheers,
> > 
> > Mark



From Igor.Nekrestyanov at Sun.COM  Thu Nov 13 09:33:50 2008
From: Igor.Nekrestyanov at Sun.COM (Igor Nekrestyanov)
Date: Thu, 13 Nov 2008 20:33:50 +0300
Subject: [OpenJDK 2D-Dev] Bug in pisces Renderer	(uninitialized	crossings)
In-Reply-To: <1226579411.4563.17.camel@dijkstra.wildebeest.org>
References: <1225119212.3329.29.camel@dijkstra.wildebeest.org>
	<1225791009.3320.4.camel@dijkstra.wildebeest.org>
	<1226579411.4563.17.camel@dijkstra.wildebeest.org>
Message-ID: <491C64FE.4070408@sun.com>

Hi Mark,

your patch looks ok to me but i am not expert in pisces.

Alexey Ushakov, who is our expert in pisces should have returned from 
vacation today
and i think he will review this soon.

-igor

Mark Wielaard wrote:
> Hi,
>
> On Tue, 2008-11-04 at 10:30 +0100, Mark Wielaard wrote:
>   
>> If anybody would take a look at this fix that would be appreciated.
>>     
>
> Anybody?
>
>   
>> On Mon, 2008-10-27 at 15:53 +0100, Mark Wielaard wrote:
>>     
>>> There is a bug in the pisces Renderer in crossingListFinished(). Both
>>> crossings and crossingIndices might not have been initialized, so have
>>> to be checked for being null. They only get initialized if
>>> setCrossingsExtents() was called earlier, which might not always be the
>>> case when crossingListFinished() is called from _endRendering().
>>>
>>> You can see this with for example this applet (you will need to have the
>>> IcedTeaPlugin installed):
>>> http://www.jroller.com/dgilbert/entry/jfreechart_and_jxlayer
>>> The magnifying glass will not work, and you will get an exception:
>>> Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException
>>>   at sun.java2d.pisces.Renderer.crossingListFinished(Renderer.java:778)
>>>   at sun.java2d.pisces.Renderer._endRendering(Renderer.java:466)
>>>   at sun.java2d.pisces.Renderer.endRendering(Renderer.java:478)
>>>   at sun.java2d.pisces.PiscesRenderingEngine.getAATileGenerator(PiscesRenderingEngine.java:327)
>>>   at sun.java2d.pipe.AAShapePipe.renderPath(AAShapePipe.java:93)
>>>   at sun.java2d.pipe.AAShapePipe.fill(AAShapePipe.java:65)
>>>   at sun.java2d.pipe.ValidatePipe.fill(ValidatePipe.java:160)
>>>   at sun.java2d.SunGraphics2D.fill(SunGraphics2D.java:2422)
>>>   at org.jfree.chart.plot.Plot.fillBackground(Plot.java:1021)
>>> [...]
>>>
>>> Attached is the workaround that I checked into IcedTea to make this work
>>> reliably:
>>>
>>> 2008-10-27  Mark Wielaard  <mark at klomp.org>
>>>
>>>         * patches/icedtea-renderer-crossing.patch: New patch.
>>>         * Makefile.am (ICEDTEA_PATCHES): Add new patch.
>>>         * HACKING: Document new patch.
>>>
>>> Cheers,
>>>
>>> Mark
>>>       
>
>   



From bugzilla-daemon at icedtea.classpath.org  Thu Nov 13 12:06:10 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 13 Nov 2008 20:06:10 +0000
Subject: [Bug 256] New: Error loging on to Nordea Homebanking
Message-ID: <E1L0iSA-0005Wz-MM@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=256

           Summary: Error loging on to Nordea Homebanking
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: nikolaj at sheller.dk


I am using IcedTea on Ubuntu Intrepid Ibex 8.10
2.6.27-7-generic #1 SMP Tue Nov 4 19:33:06 UTC 2008 x86_64 GNU/Linux

IcedTea Web Browser Plugin
    File name: IcedTeaPlugin.so
    The IcedTea Web Browser Plugin 1.4 (6b13~pre1-0ubuntu1~ppa1) executes Java
applets.

We have 2 accounts at Nordea. One account can log in do transfers, etc., and
the other account cannot log in, because the password is not accepted.
We have made sure the correct password and key file is being used for both
accounts.

The name of the account user that can log on only has characters in the range:
[a-zA-Z], the other account user has Danish characters in the name i.e.
[??????].

Line 8370 in the attached log:
PLUGIN GOT RETURN UTF-16 STRING: 1080: ??INITPIN??KENDENAVN?[First
name]?L?bner??KENDENAVN?

The string "L?bner" should read "L?bner". In this context it seems as though ?
is used as a placeholder for non-latin characters.
I suspect the ? causes the banking applet to become confused about the name
being authenticated. It looks as though ? is used as a separator in the rest of
the string on line 8370.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 13 12:14:03 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 13 Nov 2008 20:14:03 +0000
Subject: [Bug 256] Error loging on to Nordea Homebanking
Message-ID: <E1L0iZn-0005bs-Hl@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=256





------- Comment #1 from nikolaj at sheller.dk  2008-11-13 20:14 -------
Created an attachment (id=140)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=140&action=view)
Log of failed login attempt

The applet is started, a key file is selected, and the user entered a password
to authenticate. The password is not accepted as being incorrect. The page with
the applet is then closed.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From Dalibor.Topic at Sun.COM  Thu Nov 13 13:37:41 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Thu, 13 Nov 2008 22:37:41 +0100
Subject: Public open specs
In-Reply-To: <1226579378.4563.15.camel@dijkstra.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<loom.20080918T020345-276@post.gmane.org>
	<17c6771e0809180328s3aeacca4m8a3969ba2abf4c84@mail.gmail.com>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
Message-ID: <491C9E25.6050301@sun.com>

Mark Wielaard wrote:
> Hi Dalibor,
>   
> So, any progress? It would be good to at least have the specs for the
> active projects (nio2, modules, mlvm, etc) published freely and openly
> if that is easier to accomplish on short notice before we liberate all
> the other relevant specs.
>   
As far as I understand your initial request, you are interested in
getting the description of the class file format
changes for SE 6 published in a way similar to how they've been done for
other VM spec changes,
and those are the ones where I've been looking at.

Unfortunately, I don't have any further news on that item yet, though,
but I'll politely pass the poke on.

cheers,
dalibor topic


-- 
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring




From mark at klomp.org  Thu Nov 13 14:10:23 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 13 Nov 2008 23:10:23 +0100
Subject: Public open specs
In-Reply-To: <491C9E25.6050301@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<loom.20080918T020345-276@post.gmane.org>
	<17c6771e0809180328s3aeacca4m8a3969ba2abf4c84@mail.gmail.com>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
Message-ID: <1226614223.10363.4.camel@hermans.wildebeest.org>

Hi Dalibor,

On Thu, 2008-11-13 at 22:37 +0100, Dalibor Topic wrote:
> > So, any progress? It would be good to at least have the specs for the
> > active projects (nio2, modules, mlvm, etc) published freely and openly
> > if that is easier to accomplish on short notice before we liberate all
> > the other relevant specs.
> >   
> As far as I understand your initial request, you are interested in
> getting the description of the class file format
> changes for SE 6 published in a way similar to how they've been done for
> other VM spec changes,
> and those are the ones where I've been looking at.

That was just an example. The original discussion was actually about
some specific java language changes in the JDK6 specs. I think the
important thing is having the specification documents for the parts that
we work on in openjdk in the open. If you want to focus on some of them
specificly first, then I believe the three I mentioned above are the
best to target since they are in active development now. Ultimately
getting all the specs for which Sun holds the copyrights under
non-restricting terms compatible with the GPL would of course be the
goal.

Thanks,

Mark



From Dalibor.Topic at Sun.COM  Thu Nov 13 14:41:32 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Thu, 13 Nov 2008 23:41:32 +0100
Subject: Public open specs
In-Reply-To: <1226614223.10363.4.camel@hermans.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
Message-ID: <491CAD1C.8040106@sun.com>

Mark Wielaard wrote:
> Hi Dalibor,
>
> On Thu, 2008-11-13 at 22:37 +0100, Dalibor Topic wrote:
>   
>>> So, any progress? It would be good to at least have the specs for the
>>> active projects (nio2, modules, mlvm, etc) published freely and openly
>>> if that is easier to accomplish on short notice before we liberate all
>>> the other relevant specs.
>>>   
>>>       
>> As far as I understand your initial request, you are interested in
>> getting the description of the class file format
>> changes for SE 6 published in a way similar to how they've been done for
>> other VM spec changes,
>> and those are the ones where I've been looking at.
>>     
>
> That was just an example. 
Ok. That's the one thing I am looking at, anyway, as it seems to be the
most promising one to me (the JVM spec
has been published for a long time without clickthroughs), in particular
in letting me get an idea how the whole J*
acronym system works.
> Ultimately getting all the specs for which Sun holds the copyrights under
> non-restricting terms compatible with the GPL would of course be the
> goal.
>   
I don't think I really understand what terms you believe to be to be
incompatible with the GPL. Do you
have a specific legal analysis to point me to?

I'm curious since I know that GPLd implementations of JSRs have been
around as long as JBoss
(a division of Red Hat) was, so I have trouble figuring out how both
JBoss and your claim can coexist,
figuratively speaking.

cheers,
dalibor topic

-- 
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring




From Dalibor.Topic at Sun.COM  Thu Nov 13 15:02:36 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Fri, 14 Nov 2008 00:02:36 +0100
Subject: Public open specs
In-Reply-To: <491C9E25.6050301@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<loom.20080918T020345-276@post.gmane.org>
	<17c6771e0809180328s3aeacca4m8a3969ba2abf4c84@mail.gmail.com>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
Message-ID: <491CB20C.3000106@sun.com>

Dalibor Topic wrote:
> Unfortunately, I don't have any further news on that item yet, though,
> but I'll politely pass the poke on.
Poke replies indicate that the matter seems to be moving forward through
the instances.
/me crosses fingers and hopes for the best.

cheers,
dalibor topic

-- 
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring




From matthew.flaschen at gatech.edu  Thu Nov 13 15:16:50 2008
From: matthew.flaschen at gatech.edu (Matthew Flaschen)
Date: Thu, 13 Nov 2008 18:16:50 -0500
Subject: Public open specs
In-Reply-To: <491CAD1C.8040106@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>	<1221735243.3256.14.camel@dijkstra.wildebeest.org>	<48D25FA3.1010101@sun.com>	<1221748023.3256.55.camel@dijkstra.wildebeest.org>	<48D3779C.4090503@sun.com>	<1221819427.3288.2.camel@dijkstra.wildebeest.org>	<48D38203.8040609@sun.com>	<1221821605.3288.10.camel@dijkstra.wildebeest.org>	<48D38A0B.8070305@sun.com>	<1222347445.3266.72.camel@dijkstra.wildebeest.org>	<48DB92FC.3060100@sun.com>	<1222940811.3265.12.camel@dijkstra.wildebeest.org>	<1223541805.3958.3.camel@dijkstra.wildebeest.org>	<48F4BD78.1060704@sun.com>	<1223999173.3470.11.camel@hermans.wildebeest.org>	<48F4DD1E.6000106@sun.com>	<1224616572.3700.22.camel@hermans.wildebeest.org>	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>	<1225975749.4621.5.camel@dijkstra.wildebeest.org>	<1226579378.4563.15.camel@dijkstra.wildebeest.org>	<491C9E25.6050301@sun.com>	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
Message-ID: <491CB562.40908@gatech.edu>

Dalibor Topic wrote:
> I'm curious since I know that GPLd implementations of JSRs have been
> around as long as JBoss
> (a division of Red Hat) was, so I have trouble figuring out how both
> JBoss and your claim can coexist,
> figuratively speaking.

There's a difference between an implementation that /happens/ to conform
to a spec (which can be accomplished by reverse-engineering) in which
case the spec's terms are irrelevant, and a implementation that is based
on /reading/ the spec, in which case the terms are essential.

It is also possible that other developers violated the JSR terms, but
obviously that isn't wise.

Matt Flaschen


From mark at klomp.org  Thu Nov 13 15:31:28 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 14 Nov 2008 00:31:28 +0100
Subject: Public open specs
In-Reply-To: <491CAD1C.8040106@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
Message-ID: <1226619088.5290.4.camel@dijkstra.wildebeest.org>

Hi Dalibor,

On Thu, 2008-11-13 at 23:41 +0100, Dalibor Topic wrote:
> > That was just an example. 
> Ok. That's the one thing I am looking at, anyway, as it seems to be the
> most promising one to me (the JVM spec
> has been published for a long time without clickthroughs), in particular
> in letting me get an idea how the whole J*
> acronym system works.

Yes, getting these things published without any click-through licenses
would indeed be really good.

> > Ultimately getting all the specs for which Sun holds the copyrights under
> > non-restricting terms compatible with the GPL would of course be the
> > goal.
> >   
> I don't think I really understand what terms you believe to be to be
> incompatible with the GPL.

I believe these were mentioned a couple of times in our discussion
already. There are currently restrictions on the JSRs that prevent
reusing any Sun OpenJDK code for implementations because they aren't
considered "independent" because of clause 5 ('"Independent
Implementation" shall mean an implementation of the Specification that
neither derives from any of Sun's source code or binary code
materials, ...'). And even for "independent" implementations clauses 2
(a - c) limit the scope of the code you can publish, which conflicts
with the rights granted under the GPL, which doesn't limit the scope
("does not modify, subset, superset, etc.").

Cheers,

Mark



From Dalibor.Topic at Sun.COM  Fri Nov 14 05:44:47 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Fri, 14 Nov 2008 14:44:47 +0100
Subject: Public open specs
In-Reply-To: <491CB562.40908@gatech.edu>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<1221735243.3256.14.camel@dijkstra.wildebeest.org>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com> <491CB562.40908@gatech.edu>
Message-ID: <491D80CF.7060507@sun.com>

Matthew Flaschen wrote:
> Dalibor Topic wrote:
>   
>> I'm curious since I know that GPLd implementations of JSRs have been
>> around as long as JBoss
>> (a division of Red Hat) was, so I have trouble figuring out how both
>> JBoss and your claim can coexist,
>> figuratively speaking.
>>     
>
> There's a difference between an implementation that /happens/ to conform
> to a spec (which can be accomplished by reverse-engineering) in which
> case the spec's terms are irrelevant, and a implementation that is based
> on /reading/ the spec, in which case the terms are essential.
>   
Given that most GPLd implementation of JSRs are done by people who sit
on the expert groups of the same JSRs
and help write the specs (JBoss, Red Hat, Sun, ObjectWeb, etc.), I don't
think the distinction you're trying to make
matters, unless they are all writing the specs without reading them.

That doesn't seem to be very plausible to me.
> It is also possible that other developers violated the JSR terms, but
> obviously that isn't wise.
In face of one person claiming A, and many others successfully doing !A
for the last couple of years,
I'd regard A to be an extraordinary claim that requires extraordinary
proof, like say a lawyerly scholar's analysis.

Speculation that the many others were wrong with the !A claim despite
evidence to the contrary seems to me to fail
Occam's razor - the more plausible, simpler explanation is that claim A
is not as correct as it may initially seem.

cheers,
dalibor topic

-- 
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring




From Dalibor.Topic at Sun.COM  Fri Nov 14 06:05:00 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Fri, 14 Nov 2008 15:05:00 +0100
Subject: Public open specs
In-Reply-To: <1226619088.5290.4.camel@dijkstra.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
Message-ID: <491D858C.70109@sun.com>

Mark Wielaard wrote:
> Hi Dalibor,
>
> On Thu, 2008-11-13 at 23:41 +0100, Dalibor Topic wrote:
>   
>>> That was just an example. 
>>>       
>> Ok. That's the one thing I am looking at, anyway, as it seems to be the
>> most promising one to me (the JVM spec
>> has been published for a long time without clickthroughs), in particular
>> in letting me get an idea how the whole J*
>> acronym system works.
>>     
>
> Yes, getting these things published without any click-through licenses
> would indeed be really good.
>   
Great, than I'll continue poking around there, and report back as I hear
more. Thank you for your patience, and
continued friendly reminders, I really appreciate them.
>   
>>> Ultimately getting all the specs for which Sun holds the copyrights under
>>> non-restricting terms compatible with the GPL would of course be the
>>> goal.
>>>   
>>>       
>> I don't think I really understand what terms you believe to be to be
>> incompatible with the GPL.
>>     
>
> I believe these were mentioned a couple of times in our discussion
> already. There are currently restrictions on the JSRs that prevent
> reusing any Sun OpenJDK code for implementations because they aren't
> considered "independent" because of clause 5 ('"Independent
> Implementation" shall mean an implementation of the Specification that
> neither derives from any of Sun's source code or binary code
> materials, ...'). 
That does not seem to be a GPL compatibility issue to me.

Could you elaborate why you believe that to be the case?
> And even for "independent" implementations clauses 2
> (a - c) limit the scope of the code you can publish, which conflicts
> with the rights granted under the GPL, which doesn't limit the scope
> ("does not modify, subset, superset, etc.").
>   

Is there a specific legal analysis backing up that argument you can
point me to, or is that your
personal opinion? The reason why I'm asking is that a claim of a
fundamental GPL incompatibility of
JSR spec licensing seems to be quite extraordinary on the face of
existence of successful GPL licensed
implementations so far, including those done by Red Hat, JBoss,
ObjectWeb and others, for example.

If what you have is your personal non-lawyerly opinion, than that's
cool, too - but in that case I'd suggest
focusing the argument for spec license changes on more promising aspects
- the GPL incompatibility
argument is not really a great tool for me to work with in face of a lot
of GPLd code successfully
implementing JSRs showing the opposite.

cheers,
dalibor topic

--
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring




From mark at klomp.org  Fri Nov 14 07:01:48 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 14 Nov 2008 16:01:48 +0100
Subject: Public open specs
In-Reply-To: <491D858C.70109@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<48D25FA3.1010101@sun.com>
	<1221748023.3256.55.camel@dijkstra.wildebeest.org>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
	<491D858C.70109@sun.com>
Message-ID: <1226674908.3266.58.camel@dijkstra.wildebeest.org>

Hi Dalibor,

On Fri, 2008-11-14 at 15:05 +0100, Dalibor Topic wrote:
> Mark Wielaard wrote:
> > Yes, getting these things published without any click-through licenses
> > would indeed be really good.
> >   
> Great, than I'll continue poking around there, and report back as I hear
> more. Thank you for your patience, and
> continued friendly reminders, I really appreciate them.

No worries, I'll keep reminding.

> > There are currently restrictions on the JSRs that prevent
> > reusing any Sun OpenJDK code for implementations because they aren't
> > considered "independent" because of clause 5 ('"Independent
> > Implementation" shall mean an implementation of the Specification that
> > neither derives from any of Sun's source code or binary code
> > materials, ...'). 
> That does not seem to be a GPL compatibility issue to me.

It explicitly says that the license is only for implementing an
Independent Implementation, and that code derived from Sun's source code
is not considered an "Independent Implementation". Since we are talking
about OpenJDK (Sun's source code), which is distributed under the GPL
that seems an conflict. Unless Sun declares that accepting this JSR
license agreement does not in any way take away any rights that were
granted under the GPL for OpenJDK and that even after accepting the JSR
license you are allowed to publish any derivative work of OpenJDK
without any restrictions following the GPL.

> > clauses 2
> > (a - c) limit the scope of the code you can publish, which conflicts
> > with the rights granted under the GPL, which doesn't limit the scope
> > ("does not modify, subset, superset, etc.").
>  [...]
> If what you have is your personal non-lawyerly opinion, than that's
> cool, too - but in that case I'd suggest
> focusing the argument for spec license changes on more promising aspects
> - the GPL incompatibility
> argument is not really a great tool for me to work with in face of a lot
> of GPLd code successfully
> implementing JSRs showing the opposite.

I am somewhat puzzled by your reply. For years we have known that the
restrictions mentioned in these JSR licenses are incompatible with the
way our communities work. You have been a very good spokesperson for the
community explaining why these kind of restrictive licenses used by Sun
are just nuts. I have read and laughed a lot about blog posts you made
in the past explaining such things in simple, direct words. That you now
suddenly don't see how these restrictions on what code you can publish
are incompatible with the whole spirit of the GPL is somewhat strange to
me.

That we as a community have never accepted these restrictive licenses to
implement GNU Classpath, GCJ, Kaffe, etc. and still managed to create
such a volume of code that was to a high degree compatible with the
proprietary reference implementations is a big compliment to the
dedication of the community. It does not however in any way make the
restrictions written down in clauses 2 (a - c) less true.

I had hoped that now that Sun itself is publishing code under the GPL
and now that you, who in the past understood the bad effect of these
restrictions all too well, work for Sun, would mean we could make
progress in getting these documents finally published in the open. In a
free way, so there are no restrictions on the code that people can
publish who just want to read these JSRs.

Cheers,

Mark



From omajid at redhat.com  Fri Nov 14 07:10:31 2008
From: omajid at redhat.com (Omair Majid)
Date: Fri, 14 Nov 2008 15:10:31 +0000
Subject: changeset in /hg/icedtea6: 2008-11-14  Omair Majid  <omajid@redh...
Message-ID: <hg.bc2e4f1176b2.1226675431.2873452341184383832@icedtea.classpath.org>

changeset bc2e4f1176b2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bc2e4f1176b2
description:
	2008-11-14  Omair Majid  <omajid at redhat.com>

	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
	    Removed useless SuppressWarnings.
	    (static): Delegate the loading of native libraries to SecurityWrapper.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java
	    (static): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java
	    (static): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java
	    (static): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
	    (static): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
	    (static): Likewise.
	    * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java
	    New class.
	    (loadNativeLibrary): Loads libpulse-java.so in a privileged operation to
	    work when a security manager is installed.

diffstat:

8 files changed, 53 insertions(+), 9 deletions(-)
ChangeLog                                                                      |   20 +++++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java            |    4 -
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java            |    2 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java       |    2 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java |    2 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java |    2 
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java      |   27 ++++++++++
pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java               |    3 -

diffs (144 lines):

diff -r 89e71b641b8e -r bc2e4f1176b2 ChangeLog
--- a/ChangeLog	Tue Nov 11 04:38:04 2008 -0500
+++ b/ChangeLog	Fri Nov 14 10:10:11 2008 -0500
@@ -1,3 +1,23 @@ 2008-11-11  Gary Benson  <gbenson at redhat
+2008-11-14  Omair Majid  <omajid at redhat.com>
+
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
+	Removed useless SuppressWarnings.
+	(static): Delegate the loading of native libraries to SecurityWrapper.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java
+	(static): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java
+	(static): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java
+	(static): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java 
+	(static): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
+	(static): Likewise.
+	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java
+	New class.
+	(loadNativeLibrary): Loads libpulse-java.so in a privileged operation to
+	work when a security manager is installed.
+
 2008-11-11  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java	Tue Nov 11 04:38:04 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java	Fri Nov 14 10:10:11 2008 -0500
@@ -92,9 +92,7 @@ public class EventLoop implements Runnab
 	/*
 	 * These fields hold pointers
 	 */
-	@SuppressWarnings("unused")
 	private byte[] contextPointer;
-	@SuppressWarnings("unused")
 	private byte[] mainloopPointer;
 
 	/*
@@ -102,7 +100,7 @@ public class EventLoop implements Runnab
 	 */
 
 	static {
-		System.loadLibrary("pulse-java");
+		SecurityWrapper.loadNativeLibrary();
 	}
 
 	private EventLoop() {
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java	Tue Nov 11 04:38:04 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java	Fri Nov 14 10:10:11 2008 -0500
@@ -58,7 +58,7 @@ public class Operation {
 	}
 
 	static {
-		System.loadLibrary("pulse-java");
+		SecurityWrapper.loadNativeLibrary();
 	}
 
 	private native void native_ref();
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java	Tue Nov 11 04:38:04 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java	Fri Nov 14 10:10:11 2008 -0500
@@ -63,7 +63,7 @@ public abstract class PulseAudioPort ext
 	private PulseAudioVolumeControl volumeControl;
 
 	static {
-		System.loadLibrary("pulse-java");
+		SecurityWrapper.loadNativeLibrary();
 	}
 
 	public PulseAudioPort(String name) {
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java	Tue Nov 11 04:38:04 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java	Fri Nov 14 10:10:11 2008 -0500
@@ -45,7 +45,7 @@ public class PulseAudioSourcePort extend
 	/* aka mic */
 
 	static {
-		System.loadLibrary("pulse-java");
+		SecurityWrapper.loadNativeLibrary();
 	}
 
 	public PulseAudioSourcePort(String name) {
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java	Tue Nov 11 04:38:04 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java	Fri Nov 14 10:10:11 2008 -0500
@@ -44,7 +44,7 @@ public class PulseAudioTargetPort extend
 	/* aka speaker */
 
 	static {
-		System.loadLibrary("pulse-java");
+		SecurityWrapper.loadNativeLibrary();
 	}
 
 	public PulseAudioTargetPort(String name) {
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java	Fri Nov 14 10:10:11 2008 -0500
@@ -0,0 +1,27 @@
+package org.classpath.icedtea.pulseaudio;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+class SecurityWrapper {
+
+	public static void loadNativeLibrary() {
+
+		if (System.getSecurityManager() != null) {
+			PrivilegedAction<Boolean> action = new PrivilegedAction<Boolean>() {
+				@Override
+				public Boolean run() {
+					System.loadLibrary("pulse-java");
+					return true;
+				}
+
+			};
+
+			AccessController.doPrivileged(action);
+
+		} else {
+			System.loadLibrary("pulse-java");
+		}
+
+	}
+}
diff -r 89e71b641b8e -r bc2e4f1176b2 pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java
--- a/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java	Tue Nov 11 04:38:04 2008 -0500
+++ b/pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java	Fri Nov 14 10:10:11 2008 -0500
@@ -104,11 +104,10 @@ public class Stream {
 
 	public static final String DEFAULT_DEVICE = null;
 
-	@SuppressWarnings("unused")
 	private byte[] streamPointer;
 
 	static {
-		System.loadLibrary("pulse-java");
+		SecurityWrapper.loadNativeLibrary();
 	}
 
 	private Format format;


From Dalibor.Topic at Sun.COM  Fri Nov 14 10:20:16 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Fri, 14 Nov 2008 19:20:16 +0100
Subject: Public open specs
In-Reply-To: <1226674908.3266.58.camel@dijkstra.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
	<491D858C.70109@sun.com>
	<1226674908.3266.58.camel@dijkstra.wildebeest.org>
Message-ID: <491DC160.4030004@sun.com>

Mark Wielaard wrote:
> Hi Dalibor,
>   
>>> There are currently restrictions on the JSRs that prevent
>>> reusing any Sun OpenJDK code for implementations because they aren't
>>> considered "independent" because of clause 5 ('"Independent
>>> Implementation" shall mean an implementation of the Specification that
>>> neither derives from any of Sun's source code or binary code
>>> materials, ...'). 
>>>       
>> That does not seem to be a GPL compatibility issue to me.
>>     
>
> It explicitly says that the license is only for implementing an
> Independent Implementation, and that code derived from Sun's source code
> is not considered an "Independent Implementation". Since we are talking
> about OpenJDK (Sun's source code), which is distributed under the GPL
> that seems an conflict. Unless Sun declares that accepting this JSR
> license agreement does not in any way take away any rights that were
> granted under the GPL for OpenJDK and that even after accepting the JSR
> license you are allowed to publish any derivative work of OpenJDK
> without any restrictions following the GPL.
>   
Thank you very much for the explanation, Mark. Technically speaking,
that doesn't seem to be a GPL
compatibility issue - when the FSF speaks about GPL compatibility, it
talks about something else:
http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html#WhatDoesCompatMean
*
"What does it mean to say a license is ?compatible with the GPL?.
<http://www.gnu.org/licenses/old-licenses/gpl-2.0-faq.html#TOCWhatDoesCompatMean>*


    It means that the other license and the GNU GPL are compatible; you
    can combine code released under the other license with code released
    under the GNU GPL in one larger program.

    The GPL permits such a combination provided it is released under the
    GNU GPL. The other license is compatible with the GPL if it permits
    this too."


Since the specification license is used for specifications, which are
basically documentation in say, PDF or HTML formats, and aren't executable,
there doesn't seem to be a useful scenario in which combining the two in
one larger program makes a lot of practical sense.

>From your last line about using the specs while working on OpenJDK, it
seems that you are looking for assurance
from Sun about something else. I'd be happy to explore addressing that
question in the Open Source Java FAQ, in
case it hasn't been addressed yet.
>>> clauses 2
>>> (a - c) limit the scope of the code you can publish, which conflicts
>>> with the rights granted under the GPL, which doesn't limit the scope
>>> ("does not modify, subset, superset, etc.").
>>>       
>>  [...]
>> If what you have is your personal non-lawyerly opinion, than that's
>> cool, too - but in that case I'd suggest
>> focusing the argument for spec license changes on more promising aspects
>> - the GPL incompatibility
>> argument is not really a great tool for me to work with in face of a lot
>> of GPLd code successfully
>> implementing JSRs showing the opposite.
>>     
>
> I am somewhat puzzled by your reply. For years we have known that the
> restrictions mentioned in these JSR licenses are incompatible with the
> way our communities work. You have been a very good spokesperson for the
> community explaining why these kind of restrictive licenses used by Sun
> are just nuts. I have read and laughed a lot about blog posts you made
> in the past explaining such things in simple, direct words. That you now
> suddenly don't see how these restrictions on what code you can publish
> are incompatible with the whole spirit of the GPL is somewhat strange to
> me.
>   
Ah! Let me explain, then - sometimes I assume that my song and dance act
is as obvious to others as it is to me. My apologies.

You've mentioned in your previous post about a dozen JSRs for which
you'd like to see me explore alternative licensing options for the
specifications.
I'm more than happy to do so, as that aligns very much with my own goals
and ambitions as a free software activist and developer.

As you can probably imagine, though, such a change would need to go
through many hands and heads, including spec leads, and
actual lawyers who understand all the involved licenses, so it would be
in effect a significant investment in time for at least a dozen people.
So, before I embark on that long journey, and try to make that happen, I
want to make sure that I have the best arguments to convince
everyone that such a change is necessary and desirable in the most
effective way.

You've had me at hello, of course ;) But in order to get the best
arguments for that cause, I need to step into the role of a very nasty
advocatus diaboli, and examine the arguments made not just with the eye
of an activist, but also with the eye on arguments that could be
brought against them, like the mean little technicality I used above.

The problem, in my opinion, on focusing the argument for a spec license
change on mental gymnastics around trying to fit the description of the
problem
to the trusty and familiar bludgeon of GPL incompatibility is that such
mental gymnastics are not necessarily as convincing to a practicing lawyer
as they are to a practicing free software activist. Reasonable people
can have arguments about the interpretation of the GPL, for example, not to
mention other licenses.  So I don't want to even go there, if I can
avoid it, because I think that kind of argument is, while familiar and
evoking
strong emotions, setting that cause up for slow failure amidst hefty
non-lawyerly handwaving.

Similarly, I don't think that hypothetical scenarios are as convincing
as real, existing issues - and those are the kind of things I'd expect
to see brought up
for the specifications you mentioned, in order to be able to make a
good, convincing case for change of existing terms for them. I believe
that the
'incompatible with the way our communities work' angle you mentioned
above is one that is a lot more promising in yielding strong arguments
that hold
up upon close inspection, then an angle that tries to frame the issue as
a matter of GPL interpretation.

cheers,
dalibor topic,

-- 
*******************************************************************
Dalibor Topic                   Tel: (+49 40) 23 646 738
Java F/OSS Ambassador           AIM: robiladonaim
Sun Microsystems GmbH           Mobile: (+49 177) 2664 192
Nagelsweg 55                    http://openjdk.java.net
D-20097 Hamburg                 mailto:Dalibor.Topic at sun.com
Sitz der Gesellschaft: Sonnenallee 1, D-85551 Kirchheim-Heimstetten
Amtsgericht M?nchen: HRB 161028
Gesch?ftsf?hrer: Thomas Schr?der, Wolfgang Engels, Dr. Roland B?mer
Vorsitzender des Aufsichtsrates: Martin H?ring




From mark at klomp.org  Sat Nov 15 01:01:22 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 15 Nov 2008 10:01:22 +0100
Subject: Public open specs
In-Reply-To: <491DC160.4030004@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<48D3779C.4090503@sun.com>
	<1221819427.3288.2.camel@dijkstra.wildebeest.org>
	<48D38203.8040609@sun.com>
	<1221821605.3288.10.camel@dijkstra.wildebeest.org>
	<48D38A0B.8070305@sun.com>
	<1222347445.3266.72.camel@dijkstra.wildebeest.org>
	<48DB92FC.3060100@sun.com>
	<1222940811.3265.12.camel@dijkstra.wildebeest.org>
	<1223541805.3958.3.camel@dijkstra.wildebeest.org>
	<48F4BD78.1060704@sun.com>
	<1223999173.3470.11.camel@hermans.wildebeest.org>
	<48F4DD1E.6000106@sun.com>
	<1224616572.3700.22.camel@hermans.wildebeest.org>
	<1225361534.3289.11.camel@dijkstra.wildebeesst.org>
	<1225975749.4621.5.camel@dijkstra.wildebeest.org>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
	<491D858C.70109@sun.com>
	<1226674908.3266.58.camel@dijkstra.wildebeest.org>
	<491DC160.4030004@sun.com>
Message-ID: <1226739682.16426.29.camel@hermans.wildebeest.org>

Hi Dalibor,

On Fri, 2008-11-14 at 19:20 +0100, Dalibor Topic wrote:
> Mark Wielaard wrote:
> > It explicitly says that the license is only for implementing an
> > Independent Implementation, and that code derived from Sun's source code
> > is not considered an "Independent Implementation". Since we are talking
> > about OpenJDK (Sun's source code), which is distributed under the GPL
> > that seems an conflict. Unless Sun declares that accepting this JSR
> > license agreement does not in any way take away any rights that were
> > granted under the GPL for OpenJDK and that even after accepting the JSR
> > license you are allowed to publish any derivative work of OpenJDK
> > without any restrictions following the GPL.
> [...]
> From your last line about using the specs while working on OpenJDK, it
> seems that you are looking for assurance
> from Sun about something else. I'd be happy to explore addressing that
> question in the Open Source Java FAQ, in
> case it hasn't been addressed yet.

It would be great if you could get in writing that accepting any
click-through license of any of the Sun lead JSRs, for which Sun holds
the rights, does not take away any rights that were granted under the
GPL for OpenJDK and that even after accepting the JSR license you are
allowed to publish any derivative work of OpenJDK without any
restrictions following the GPL.

Having that the the FAQ would be a good thing. Just removing the
click-through license that implies otherwise would be even better.

> >>> clauses 2
> >>> (a - c) limit the scope of the code you can publish, which
> conflicts
> >>> with the rights granted under the GPL, which doesn't limit the
> scope
> >>> ("does not modify, subset, superset, etc.").
> [...]
> You've mentioned in your previous post about a dozen JSRs for which
> you'd like to see me explore alternative licensing options for the
> specifications.
> I'm more than happy to do so, as that aligns very much with my own goals
> and ambitions as a free software activist and developer.
> 
> As you can probably imagine, though, such a change would need to go
> through many hands and heads, including spec leads, and
> actual lawyers who understand all the involved licenses, so it would be
> in effect a significant investment in time for at least a dozen people.
> So, before I embark on that long journey, and try to make that happen, I
> want to make sure that I have the best arguments to convince
> everyone that such a change is necessary and desirable in the most
> effective way.

Sure, that is why I listed just the JSRs relevant for OpenJDK
development, which have Sun as spec lead, so that there is just one
party to convince. Keep it focused.

> The problem, in my opinion, on focusing the argument for a spec license
> change on mental gymnastics around trying to fit the description of the
> problem
> to the trusty and familiar bludgeon of GPL incompatibility is that such
> mental gymnastics are not necessarily as convincing to a practicing lawyer
> as they are to a practicing free software activist. Reasonable people
> can have arguments about the interpretation of the GPL, for example, not to
> mention other licenses.  So I don't want to even go there, if I can
> avoid it, because I think that kind of argument is, while familiar and
> evoking
> strong emotions, setting that cause up for slow failure amidst hefty
> non-lawyerly handwaving.

The GPL is just the constitution that defines a bare minimum of rights
granted by Free Software, a framework in which communities work. Whether
you express it in the GPL legalize, or just point to the Free Software
definition, doesn't really matter imho.

> Similarly, I don't think that hypothetical scenarios are as convincing
> as real, existing issues - and those are the kind of things I'd expect
> to see brought up
> for the specifications you mentioned, in order to be able to make a
> good, convincing case for change of existing terms for them. I believe
> that the
> 'incompatible with the way our communities work' angle you mentioned
> above is one that is a lot more promising in yielding strong arguments
> that hold
> up upon close inspection, then an angle that tries to frame the issue as
> a matter of GPL interpretation.

So let rephrase one more time:

Since the code on which OpenJDK is based is a work in progress we are
constantly publishing sub sets or super sets of what is defined in a
JSR, restrictions on publishing such things harm cooperation in the
community that wants to improve the code. OpenJDK doesn't pass the TCK
(even though some derivatives like IcedTea do at times in certain
configurations used by some GNU/Linux distros), so any restriction on
publishing implementations that require passing a test suite cannot be
easily met by the community. Also since OpenJDK is future focused
additions are always made that were not in older specs. So by definition
the code published by the community doesn't pass either the old
spec/tck, or does not yet pass the new spec/tck. To work together the
community must be able to both read the specs and compare and share code
in progress that might or might not ever pass any tck. All such
restrictions are also in conflict with the rights granted under the GPL,
which is the license used for distributing OpenJDK and all its
derivatives.

Please fix. The list of Sun lead JSRs that are relevant for OpenJDK
hackers is below.

Getting all these JSRs published freely and openly without click-through
like you want to do for the JVM spec would solve all these issues.

Thanks,

Mark

JSR 105: XML Digital Signature APIs
JSR 199: Java Compiler API
JSR 202: JavaTM Class File Specification Update
JSR 203: More New I/O APIs for the JavaTM Platform ("NIO.2")
JSR 221: JDBC 4.0 API Specification
JSR 222: Java Architecture for XML Binding (JAXB) 2.0
JSR 223: Scripting for the Java Platform
JSR 224: Java API for XML-Based Web Services (JAX-WS) 2.0
JSR 250: Common Annotations for the Java Platform
JSR 255: Java Management Extensions (JMX) Specification, version 2.0
JSR 269: Pluggable Annotation Processing API
JSR 270: Java SE 6 Release Contents
JSR 277: Java Module System
JSR 292: Supporting Dynamically Typed Languages on the Java Platform
JSR 294: Improved Modularity Support in the Java Programming Language



From mark at klomp.org  Sat Nov 15 05:07:21 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 15 Nov 2008 13:07:21 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-display-mode-change...
Message-ID: <hg.4548cfdc09fe.1226754441.2873452341184383832@icedtea.classpath.org>

changeset 4548cfdc09fe in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4548cfdc09fe
description:
	* patches/icedtea-display-mode-changer.patch: New patch.
	       * Makefile.am (ICEDTEA_PATCHES): Add new patch.
	       * HACKING: Document new patch.

diffstat:

4 files changed, 109 insertions(+), 1 deletion(-)
ChangeLog                                  |    6 +
HACKING                                    |    1 
Makefile.am                                |    3 
patches/icedtea-display-mode-changer.patch |  100 ++++++++++++++++++++++++++++

diffs (141 lines):

diff -r bc2e4f1176b2 -r 4548cfdc09fe ChangeLog
--- a/ChangeLog	Fri Nov 14 10:10:11 2008 -0500
+++ b/ChangeLog	Sat Nov 15 14:07:14 2008 +0100
@@ -1,3 +1,9 @@ 2008-11-14  Omair Majid  <omajid at redhat.
+2008-11-15  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-display-mode-changer.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-11-14  Omair Majid  <omajid at redhat.com>
 
 	* pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java
diff -r bc2e4f1176b2 -r 4548cfdc09fe HACKING
--- a/HACKING	Fri Nov 14 10:10:11 2008 -0500
+++ b/HACKING	Sat Nov 15 14:07:14 2008 +0100
@@ -67,6 +67,7 @@ The following patches are currently appl
 * icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
 * icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
   #6761856, swing TextLayout.getBounds() returns shifted bounds.
+* icedtea-display-mode-changer.patch: Add extra test class.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r bc2e4f1176b2 -r 4548cfdc09fe Makefile.am
--- a/Makefile.am	Fri Nov 14 10:10:11 2008 -0500
+++ b/Makefile.am	Sat Nov 15 14:07:14 2008 +0100
@@ -537,7 +537,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-linker-libs-order.patch \
 	patches/icedtea-f2i-overflow.patch \
 	patches/icedtea-cc-interp-no-fer.patch \
-	patches/icedtea-6761856-freetypescaler.patch
+	patches/icedtea-6761856-freetypescaler.patch \
+	patches/icedtea-display-mode-changer.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r bc2e4f1176b2 -r 4548cfdc09fe patches/icedtea-display-mode-changer.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-display-mode-changer.patch	Sat Nov 15 14:07:14 2008 +0100
@@ -0,0 +1,100 @@
+6733718: test /java/awt/FullScreen/UninitializedDisplayModeChangeTest/ fails
+Reviewed-by: igor
+
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/FullScreen/UninitializedDisplayModeChangeTest/DisplayModeChanger.java	Tue Aug 05 09:37:03 2008 -0700
+@@ -0,0 +1,93 @@
++/*
++ * Copyright 2006-2008 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++import java.awt.DisplayMode;
++import java.awt.EventQueue;
++import java.awt.Frame;
++import java.awt.GraphicsDevice;
++import java.awt.GraphicsEnvironment;
++import java.lang.reflect.InvocationTargetException;
++
++/**
++ * Used by the UninitializedDisplayModeChangeTest to change the
++ * display mode.
++ */
++public class DisplayModeChanger {
++
++    public static void main(String[] args)
++        throws InterruptedException, InvocationTargetException
++    {
++        final GraphicsDevice gd =
++            GraphicsEnvironment.getLocalGraphicsEnvironment().
++                getDefaultScreenDevice();
++
++        EventQueue.invokeAndWait(new Runnable() {
++            public void run() {
++                Frame f = null;
++                if (gd.isFullScreenSupported()) {
++                    try {
++                        f = new Frame("DisplayChanger Frame");
++                        gd.setFullScreenWindow(f);
++                        if (gd.isDisplayChangeSupported()) {
++                            DisplayMode dm = findDisplayMode(gd);
++                            if (gd != null) {
++                                gd.setDisplayMode(dm);
++                            }
++                        }
++                        try {
++                            Thread.sleep(1000);
++                        } catch (InterruptedException ex) {
++                            ex.printStackTrace();
++                        }
++                        gd.setFullScreenWindow(null);
++                    } finally {
++                        if (f != null) {
++                            f.dispose();
++                        }
++                    }
++                }
++            }
++        });
++    }
++
++    /**
++     * Finds a display mode that is different from the current display
++     * mode and is likely to cause a display change event.
++     */
++    private static DisplayMode findDisplayMode(GraphicsDevice gd) {
++        DisplayMode dms[] = gd.getDisplayModes();
++        DisplayMode currentDM = gd.getDisplayMode();
++        for (DisplayMode dm : dms) {
++            if (!dm.equals(currentDM) &&
++                 dm.getRefreshRate() == currentDM.getRefreshRate())
++            {
++                // different from the current dm and refresh rate is the same
++                // means that something else is different => more likely to
++                // cause a DM change event
++                return dm;
++            }
++        }
++        return null;
++    }
++
++}
+


From mark at klomp.org  Sat Nov 15 05:11:47 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 15 Nov 2008 14:11:47 +0100
Subject: Backport 6733718: test
	/java/awt/FullScreen/UninitializedDisplayModeChangeTest fails
Message-ID: <1226754707.16426.34.camel@hermans.wildebeest.org>

Hi,

The test java/awt/FullScreen/UninitializedDisplayModeChangeTest fails
because one of the test source classes is missing:
test result: Error. Parse Exception: Test Class Exception: Can't find
source file: DisplayModeChanger.java

Luckily this has already been added in jdk7:
http://hg.openjdk.java.net/jdk7/2d/jdk/rev/06a02adcba4e

This patch adds it also to icedtea6:

2008-11-15  Mark Wielaard  <mark at klomp.org>

        * patches/icedtea-display-mode-changer.patch: New patch.
        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
        * HACKING: Document new patch.

The test now passes.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-display-mode-changer.patch
Type: text/x-patch
Size: 3842 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081115/176746e5/icedtea-display-mode-changer.patch 

From mark at klomp.org  Sat Nov 15 06:15:06 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 15 Nov 2008 15:15:06 +0100
Subject: xml-stylesheet data files usage in tests removed by fsg.sh
Message-ID: <1226758506.16426.54.camel@hermans.wildebeest.org>

Hi.

The IcedTea fsg.sh (Free Software Guidelines) script that scrubs any
dubious contents from the files distributed through OpenJDK has the
following:

# has w3c copyright. license to be checked / needs checking after decoding
rm -f \
  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64

These files are local copies of the following files:
http://www.w3.org/TR/xml-stylesheet
http://www.w3.org/Signature/2002/04/xml-stylesheet.b64
(The second is a base64 encoded version of the first.)

These files are used in the following tests:
openjdk/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
openjdk/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
(Which currently obviously fail without those files in the data dir)

These tests references the merlin-xmldsig-twenty-three Baltimore test
vectors (also distributed by the w3c):
http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html

The xml-stylesheet file references:
http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright and
http://www.w3.org/Consortium/Legal/copyright-software.html
Which seem to imply we may freely distribute them.

So I would like to remove these "cleanups" from fsg.sh.
Opinions?

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Sat Nov 15 09:42:20 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 15 Nov 2008 17:42:20 +0000
Subject: [Bug 257] New: Can't run Juniper Networks Network Connect
Message-ID: <E1L1PA4-0002jl-Jc@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=257

           Summary: Can't run Juniper Networks Network Connect
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: rayvd at bludgeon.org


My impression is this was the result of the plugin not supporting signed
applets, but supposedly this has been fixed.

When I attempt to connect to my company's VPN via the Juniper Network Connect
java applet I get errors such as the following:

Fatal: Initialization Error: A fatal error occurred while trying to verify
jars.

I will attach the java.std and java.err files from a debug run and can also
provide the .jar file in question.

This is on Fedora 10 (rawhide) using the following versions of openjdk:

java-1.6.0-openjdk-1.6.0.0-4.b12.fc10.i386
java-1.6.0-openjdk-plugin-1.6.0.0-4.b12.fc10.i386

Any ideas?  How can I provide more helpful information to track this down?


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sat Nov 15 09:43:25 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 15 Nov 2008 17:43:25 +0000
Subject: [Bug 257] Can't run Juniper Networks Network Connect
Message-ID: <E1L1PB7-0002jr-BE@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=257





------- Comment #1 from rayvd at bludgeon.org  2008-11-15 17:43 -------
Created an attachment (id=141)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=141&action=view)
Standard Error output from Firefox


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sat Nov 15 09:43:42 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 15 Nov 2008 17:43:42 +0000
Subject: [Bug 257] Can't run Juniper Networks Network Connect
Message-ID: <E1L1PBO-0002jy-RW@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=257





------- Comment #2 from rayvd at bludgeon.org  2008-11-15 17:43 -------
Created an attachment (id=142)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=142&action=view)
Standard Output from Firefox


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sat Nov 15 09:49:34 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 15 Nov 2008 17:49:34 +0000
Subject: [Bug 257] Can't run Juniper Networks Network Connect
Message-ID: <E1L1PH4-0002kI-RV@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=257





------- Comment #3 from rayvd at bludgeon.org  2008-11-15 17:49 -------
Here's the Fedora bz that mentions that this is supposedly fixed:

 https://bugzilla.redhat.com/show_bug.cgi?id=304031


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Sat Nov 15 15:05:21 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 16 Nov 2008 00:05:21 +0100
Subject: Setting public TestEnv defaults for net/nio tests needing hosts
Message-ID: <1226790321.3805.12.camel@dijkstra.wildebeest.org>

Hi,

I made sure all needed services are enabled on
icedtea.classpath.org/developer.classpath.org and set those as defaults
in TestEnv for the net/nio tests that need to contact hosts. Using
icedtea for remote_host and developer for far_host is somewhat
arbitrary, but at least these hosts are public.

I also made sure the cname.sh test uses the far_host to do its tests
instead of a hardcoded one. And I changed the SocketChannel LocalAddress
and Shutdown tests to use the echo service. Since the echo service
already has to be enabled for other tests and I didn't want to open up a
telnet port.

2008-11-15  Mark Wielaard  <mark at klomp.org>

    * patches/icedtea-testenv.patch: New patch.
    * Makefile.am (ICEDTEA_PATCHES): Add new patch.
    * HACKING: Document new patch.

All the tests using TestEnv in make check-jdk target now PASS for me.

Note that TestEnv hasn't been forward ported from jdk6 to jdk7. So I
haven't yet pushed this patch upstream to the jdk7 net/nio lists.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-testenv.patch
Type: text/x-patch
Size: 2901 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081116/20eb8833/icedtea-testenv.patch 

From mark at klomp.org  Sat Nov 15 15:06:07 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sat, 15 Nov 2008 23:06:07 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-testenv.patch: New ...
Message-ID: <hg.66a924d864e4.1226790367.2873452341184383832@icedtea.classpath.org>

changeset 66a924d864e4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=66a924d864e4
description:
	* patches/icedtea-testenv.patch: New patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.
		* HACKING: Document new patch.

diffstat:

4 files changed, 75 insertions(+), 1 deletion(-)
ChangeLog                     |    6 +++
HACKING                       |    1 
Makefile.am                   |    3 +
patches/icedtea-testenv.patch |   66 +++++++++++++++++++++++++++++++++++++++++

diffs (107 lines):

diff -r 4548cfdc09fe -r 66a924d864e4 ChangeLog
--- a/ChangeLog	Sat Nov 15 14:07:14 2008 +0100
+++ b/ChangeLog	Sun Nov 16 00:05:59 2008 +0100
@@ -1,3 +1,9 @@ 2008-11-15  Mark Wielaard  <mark at klomp.o
+2008-11-15  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-testenv.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-11-15  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-display-mode-changer.patch: New patch.
diff -r 4548cfdc09fe -r 66a924d864e4 HACKING
--- a/HACKING	Sat Nov 15 14:07:14 2008 +0100
+++ b/HACKING	Sun Nov 16 00:05:59 2008 +0100
@@ -68,6 +68,7 @@ The following patches are currently appl
 * icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug
   #6761856, swing TextLayout.getBounds() returns shifted bounds.
 * icedtea-display-mode-changer.patch: Add extra test class.
+* icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r 4548cfdc09fe -r 66a924d864e4 Makefile.am
--- a/Makefile.am	Sat Nov 15 14:07:14 2008 +0100
+++ b/Makefile.am	Sun Nov 16 00:05:59 2008 +0100
@@ -538,7 +538,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-f2i-overflow.patch \
 	patches/icedtea-cc-interp-no-fer.patch \
 	patches/icedtea-6761856-freetypescaler.patch \
-	patches/icedtea-display-mode-changer.patch
+	patches/icedtea-display-mode-changer.patch \
+	patches/icedtea-testenv.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 4548cfdc09fe -r 66a924d864e4 patches/icedtea-testenv.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-testenv.patch	Sun Nov 16 00:05:59 2008 +0100
@@ -0,0 +1,66 @@
+--- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2008-11-05 10:20:19.000000000 +0100
++++ openjdk/jdk/test/java/nio/channels/SocketChannel/LocalAddress.java	2008-11-15 22:07:26.000000000 +0100
+@@ -40,7 +40,7 @@
+         InetAddress bogus = InetAddress.getByName("0.0.0.0");
+         SocketChannel sc = SocketChannel.open();
+         InetSocketAddress saddr = new InetSocketAddress(
+-            InetAddress.getByName(TestEnv.getProperty("host")), 23);
++            InetAddress.getByName(TestEnv.getProperty("host")), 7);
+ 
+         //Test1: connect only
+         sc.connect(saddr);
+--- openjdk.orig/jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2008-11-05 10:20:19.000000000 +0100
++++ openjdk/jdk/test/java/nio/channels/SocketChannel/Shutdown.java	2008-11-15 22:07:51.000000000 +0100
+@@ -35,7 +35,7 @@
+ 
+     public static void main(String args[]) throws Exception {
+         InetSocketAddress sa = new InetSocketAddress(
+-            InetAddress.getByName(TestEnv.getProperty("host")), 23);
++            InetAddress.getByName(TestEnv.getProperty("host")), 7);
+         SocketChannel sc = SocketChannel.open(sa);
+         boolean before = sc.socket().isInputShutdown();
+         sc.socket().shutdownInput();
+--- ../openjdk6/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2008-11-05 10:21:00.000000000 +0100
++++ openjdk/jdk/test/sun/net/InetAddress/nameservice/dns/cname.sh	2008-11-15 22:58:14.000000000 +0100
+@@ -26,14 +26,19 @@
+ 
+ # @test
+ # @bug 4763315
+-# @build CanonicalName Lookup 
++# @library ../../../../..
++# @build CanonicalName Lookup TestEnv
+ # @run shell/timeout=120 cname.sh
+ # @summary Test DNS provider's handling of CNAME records
+ 
+ 
+ # The host that we try to resolve
+ 
+-HOST=webcache.sfbay.sun.com
++CLASSPATH=${TESTCLASSES}
++export CLASSPATH
++JAVA="${TESTJAVA}/bin/java"
++
++HOST=`$JAVA TestEnv -get far_host`
+ 
+ # fail gracefully if DNS is not configured or there 
+ # isn't a CNAME record.
+--- openjdk.orig/jdk/test/TestEnv.java	2008-11-05 10:16:16.000000000 +0100
++++ openjdk/jdk/test/TestEnv.java	2008-11-15 22:42:11.000000000 +0100
+@@ -65,14 +65,14 @@
+         // Reachable host with the following services running:
+         // - echo service (port 7)
+         // - day time port (port 13)
+-        { "host", "javaweb.sfbay.sun.com"  },
++        { "host", "icedtea.classpath.org"  },
+ 
+         // Reachable host that refuses connections to port 80
+-        { "refusing_host", "jano1.sfbay.sun.com" },
++        { "refusing_host", "ns1.gnu.org" },
+ 
+         // Reachable host that is of sufficient hops away that a connection
+         // takes a while to be established (connect doesn't complete immediatly)
+-        { "far_host", "irejano.ireland.sun.com" },
++        { "far_host", "developer.classpath.org" },
+ 
+         // Hostname that cannot be resolved by named service
+         { "unresovable_host", "blah-blah.blah-blah.blah" },


From gnu_andrew at member.fsf.org  Sat Nov 15 16:50:19 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 16 Nov 2008 00:50:19 +0000
Subject: Public open specs
In-Reply-To: <1226739682.16426.29.camel@hermans.wildebeest.org>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
	<491D858C.70109@sun.com>
	<1226674908.3266.58.camel@dijkstra.wildebeest.org>
	<491DC160.4030004@sun.com>
	<1226739682.16426.29.camel@hermans.wildebeest.org>
Message-ID: <17c6771e0811151650g798290b3t7f76f78bb463442b@mail.gmail.com>

>
> Getting all these JSRs published freely and openly without click-through
> like you want to do for the JVM spec would solve all these issues.
>

Couldn't agree more.  Why is it the specs for TCP (an RFC) and HTML
(W3C recommendation) are published openly on the web, yet the JSR
specifications are hidden behind pages of legalese?  Whether its onus
or not, it still has to be read and approved and is enough to
introduce doubt into people's minds.  If we could just load up a web
page and read them with no click-throughs, life would be much easier.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gnu_andrew at member.fsf.org  Sat Nov 15 16:51:41 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 16 Nov 2008 00:51:41 +0000
Subject: xml-stylesheet data files usage in tests removed by fsg.sh
In-Reply-To: <1226758506.16426.54.camel@hermans.wildebeest.org>
References: <1226758506.16426.54.camel@hermans.wildebeest.org>
Message-ID: <17c6771e0811151651o5547dfa2jd1a624a7031e9b72@mail.gmail.com>

2008/11/15 Mark Wielaard <mark at klomp.org>:
> Hi.
>
> The IcedTea fsg.sh (Free Software Guidelines) script that scrubs any
> dubious contents from the files distributed through OpenJDK has the
> following:
>
> # has w3c copyright. license to be checked / needs checking after decoding
> rm -f \
>  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
>  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64
>
> These files are local copies of the following files:
> http://www.w3.org/TR/xml-stylesheet
> http://www.w3.org/Signature/2002/04/xml-stylesheet.b64
> (The second is a base64 encoded version of the first.)
>
> These files are used in the following tests:
> openjdk/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
> openjdk/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
> (Which currently obviously fail without those files in the data dir)
>
> These tests references the merlin-xmldsig-twenty-three Baltimore test
> vectors (also distributed by the w3c):
> http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html
>
> The xml-stylesheet file references:
> http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright and
> http://www.w3.org/Consortium/Legal/copyright-software.html
> Which seem to imply we may freely distribute them.
>
> So I would like to remove these "cleanups" from fsg.sh.
> Opinions?
>
> Cheers,
>
> Mark
>
>

doko is the origin of these IIRC.

Interestingly, I don't think these tests are in OJ7.  At least, I
don't recall seeing these failures.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gnu_andrew at member.fsf.org  Sat Nov 15 17:59:32 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 16 Nov 2008 01:59:32 +0000
Subject: Backport 6733718: test
	/java/awt/FullScreen/UninitializedDisplayModeChangeTest fails
In-Reply-To: <1226754707.16426.34.camel@hermans.wildebeest.org>
References: <1226754707.16426.34.camel@hermans.wildebeest.org>
Message-ID: <17c6771e0811151759jdc58099u22ca16307c5dff37@mail.gmail.com>

2008/11/15 Mark Wielaard <mark at klomp.org>:
> Hi,
>
> The test java/awt/FullScreen/UninitializedDisplayModeChangeTest fails
> because one of the test source classes is missing:
> test result: Error. Parse Exception: Test Class Exception: Can't find
> source file: DisplayModeChanger.java
>
> Luckily this has already been added in jdk7:
> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/06a02adcba4e
>
> This patch adds it also to icedtea6:
>
> 2008-11-15  Mark Wielaard  <mark at klomp.org>
>
>        * patches/icedtea-display-mode-changer.patch: New patch.
>        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
>        * HACKING: Document new patch.
>
> The test now passes.
>
> Cheers,
>
> Mark
>

When was this added in 7? It also fails on my b39 build.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 03:55:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 11:55:59 +0000
Subject: [Bug 139] no source included for maf-1_0.jar, jlfgr-1_0.jar
Message-ID: <E1L1gER-0003sG-5L@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=139


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #5 from mark at klomp.org  2008-11-16 11:55 -------
These jar files have been removed from the sources (both 6 and 7).


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 03:55:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 11:55:59 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1L1gER-0003sR-Ef@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138


Bug 138 depends on bug 139, which changed state.

Bug 139 Summary: no source included for maf-1_0.jar, jlfgr-1_0.jar
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=139

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 03:59:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 11:59:59 +0000
Subject: [Bug 141] corba .prp files "contain restricted materials of IBM"
Message-ID: <E1L1gIJ-0003sn-V9@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=141





------- Comment #8 from mark at klomp.org  2008-11-16 11:59 -------
Fixed in 6, still an issue with 7.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Sun Nov 16 04:07:05 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 16 Nov 2008 13:07:05 +0100
Subject: xml-stylesheet data files usage in tests removed by fsg.sh
In-Reply-To: <17c6771e0811151651o5547dfa2jd1a624a7031e9b72@mail.gmail.com>
References: <1226758506.16426.54.camel@hermans.wildebeest.org>
	<17c6771e0811151651o5547dfa2jd1a624a7031e9b72@mail.gmail.com>
Message-ID: <1226837225.26105.8.camel@hermans.wildebeest.org>

Hi,

On Sun, 2008-11-16 at 00:51 +0000, Andrew John Hughes wrote:
> 2008/11/15 Mark Wielaard <mark at klomp.org>:
> > The IcedTea fsg.sh (Free Software Guidelines) script that scrubs any
> > dubious contents from the files distributed through OpenJDK has the
> > following:
> >
> > # has w3c copyright. license to be checked / needs checking after decoding
> > rm -f \
> >  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
> >  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64
> >
> > These files are local copies of the following files:
> > http://www.w3.org/TR/xml-stylesheet
> > http://www.w3.org/Signature/2002/04/xml-stylesheet.b64
> > (The second is a base64 encoded version of the first.)
> >
> > These files are used in the following tests:
> > openjdk/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
> > openjdk/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
> > (Which currently obviously fail without those files in the data dir)
> >
> > These tests references the merlin-xmldsig-twenty-three Baltimore test
> > vectors (also distributed by the w3c):
> > http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html
> >
> > The xml-stylesheet file references:
> > http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright and
> > http://www.w3.org/Consortium/Legal/copyright-software.html
> > Which seem to imply we may freely distribute them.
> >
> > So I would like to remove these "cleanups" from fsg.sh.
> > Opinions?
>
> doko is the origin of these IIRC.

Matthias, what do you think? If you think there are still issues with
these files could you add a bug report that blocks the IcedTea legal
meta-bug: http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138

> Interestingly, I don't think these tests are in OJ7.  At least, I
> don't recall seeing these failures.

The files are certainly there under 7, and they are removed by the
fsg.sh script. The Generation and Validation Tests that use them are
also there. I'll do a build and a make check to see what is happening
there.

Cheers,

Mark



From mark at klomp.org  Sun Nov 16 04:12:10 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 16 Nov 2008 13:12:10 +0100
Subject: Backport 6733718: test
	/java/awt/FullScreen/UninitializedDisplayModeChangeTest fails
In-Reply-To: <17c6771e0811151759jdc58099u22ca16307c5dff37@mail.gmail.com>
References: <1226754707.16426.34.camel@hermans.wildebeest.org>
	<17c6771e0811151759jdc58099u22ca16307c5dff37@mail.gmail.com>
Message-ID: <1226837530.26105.10.camel@hermans.wildebeest.org>

Hi Andrew,

On Sun, 2008-11-16 at 01:59 +0000, Andrew John Hughes wrote:
> 2008/11/15 Mark Wielaard <mark at klomp.org>:
> > The test java/awt/FullScreen/UninitializedDisplayModeChangeTest fails
> > because one of the test source classes is missing:
> > test result: Error. Parse Exception: Test Class Exception: Can't find
> > source file: DisplayModeChanger.java
> >
> > Luckily this has already been added in jdk7:
> > http://hg.openjdk.java.net/jdk7/2d/jdk/rev/06a02adcba4e
> > [...]
> > The test now passes.
> 
> When was this added in 7? It also fails on my b39 build.

Heay, you are right, it seems it never made it from the 2d workspace
into the main jdk7 workspace. How strange. It was added to the 2d/jdk
workspace 3 months ago.

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:32:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:32:49 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1L1go5-0003ue-IH@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138


Bug 138 depends on bug 144, which changed state.

Bug 144 Summary: jvmtiLib.xsl and archDesc.cpp generate files with SUN PROPRIETARY/CONFIDENTIAL notices (openjdk6 only)
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=144

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:32:49 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:32:49 +0000
Subject: [Bug 144] jvmtiLib.xsl and archDesc.cpp generate files with SUN
	PROPRIETARY/CONFIDENTIAL notices (openjdk6 only)
Message-ID: <E1L1go5-0003uV-77@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=144


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #2 from mark at klomp.org  2008-11-16 12:32 -------
Fixed in 6b11.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:37:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:37:59 +0000
Subject: [Bug 258] New: sun proprietary/confidential
	JarFromManifestFailure.java in openjdk6
Message-ID: <E1L1gt5-0003v2-9O@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=258

           Summary: sun proprietary/confidential JarFromManifestFailure.java
                    in openjdk6
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mark at klomp.org
OtherBugsDependingO 138
             nThis:


In jdk6 langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java is
marked as "SUN PROPRIETARY/CONFIDENTIAL" while the version in jdk7 is under the
GPL.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:37:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:37:59 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1L1gt5-0003vA-Q5@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  BugsThisDependsOn|                            |258




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Sun Nov 16 04:42:14 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 16 Nov 2008 13:42:14 +0100
Subject: sun proprietary/confidential JarFromManifestFailure.java in openjdk6
Message-ID: <1226839334.26105.15.camel@hermans.wildebeest.org>

Hi,

I just filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=258

In jdk6 langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java is
marked as "SUN PROPRIETARY/CONFIDENTIAL" while the version in jdk7 is under the
GPL.

The version in jdk7 was alsways under the GPL, and never marked as
proprietary, but the version as imported in jdk6-b05 and updated in
jdk6-b13 was.

Cheers,

Mark



From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:46:27 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:46:27 +0000
Subject: [Bug 145] hotspot copy.cpp and vmStructs_parNew.hpp source files
	contains proprietary sun notice (openjdk6 only)
Message-ID: <E1L1h1H-0003vy-LN@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=145


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #2 from mark at klomp.org  2008-11-16 12:46 -------
fixed in 6 and 7, all files are now marked as GPL.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:46:27 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:46:27 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1L1h1H-0003w6-R2@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138


Bug 138 depends on bug 145, which changed state.

Bug 145 Summary: hotspot copy.cpp and vmStructs_parNew.hpp source files contains proprietary sun notice (openjdk6 only)
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=145

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:54:56 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:54:56 +0000
Subject: [Bug 146] binaries (windows, solaris executables) in sources
Message-ID: <E1L1h9U-0003wf-9e@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=146





------- Comment #3 from mark at klomp.org  2008-11-16 12:54 -------
Still a problem in both 6 and 7. We remove these files with the fsg.sh script.

The sun bug referenced in comment #2 tracks a different issue.
There is sun bug #6695765 but that only tracks part of the problem.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:58:40 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:58:40 +0000
Subject: [Bug 147] Queens.class isn't build from source
Message-ID: <E1L1hD6-0003wx-LO@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=147


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #3 from mark at klomp.org  2008-11-16 12:58 -------
Fixed in both 6 and 7.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 04:58:40 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 12:58:40 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1L1hD6-0003x6-SC@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138


Bug 138 depends on bug 147, which changed state.

Bug 147 Summary: Queens.class isn't build from source
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=147

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 05:09:26 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 13:09:26 +0000
Subject: [Bug 148] AutoMulti and TestALFGenerator generates Sun proprietary
	notices
Message-ID: <E1L1hNW-0003xv-F5@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=148


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #2 from mark at klomp.org  2008-11-16 13:09 -------
The tools to generate the multiauto files have been removed from both 6 and 7,
so we kind of see this as being fixed.

The sun bug referenced in comment #1 tracks a different bug.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Sun Nov 16 05:09:26 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 16 Nov 2008 13:09:26 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1L1hNW-0003y4-LJ@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=138


Bug 138 depends on bug 148, which changed state.

Bug 148 Summary: AutoMulti and TestALFGenerator generates Sun proprietary notices
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=148

           What    |Old Value                   |New Value
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED



-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From Joe.Darcy at Sun.COM  Sun Nov 16 12:12:16 2008
From: Joe.Darcy at Sun.COM (Joseph D. Darcy)
Date: Sun, 16 Nov 2008 12:12:16 -0800
Subject: sun proprietary/confidential JarFromManifestFailure.java in
	openjdk6
In-Reply-To: <1226839334.26105.15.camel@hermans.wildebeest.org>
References: <1226839334.26105.15.camel@hermans.wildebeest.org>
Message-ID: <49207EA0.80803@sun.com>

Hello.

Mark Wielaard wrote:
> Hi,
>
> I just filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=258
>
> In jdk6 langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java is
> marked as "SUN PROPRIETARY/CONFIDENTIAL" while the version in jdk7 is under the
> GPL.
>
> The version in jdk7 was alsways under the GPL, and never marked as
> proprietary, but the version as imported in jdk6-b05 and updated in
> jdk6-b13 was.
>   

Sorry about that; I've filed Sun bug 6772068 for this issue and it will 
be fixed in the next OpenJDK 6 build.

-Joe




From mark at klomp.org  Sun Nov 16 12:47:11 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 16 Nov 2008 21:47:11 +0100
Subject: xml-stylesheet data files usage in tests removed by fsg.sh
In-Reply-To: <1226837225.26105.8.camel@hermans.wildebeest.org>
References: <1226758506.16426.54.camel@hermans.wildebeest.org>
	<17c6771e0811151651o5547dfa2jd1a624a7031e9b72@mail.gmail.com>
	<1226837225.26105.8.camel@hermans.wildebeest.org>
Message-ID: <1226868431.7126.33.camel@dijkstra.wildebeest.org>

Hi Andrew,

On Sun, 2008-11-16 at 13:07 +0100, Mark Wielaard wrote:
> On Sun, 2008-11-16 at 00:51 +0000, Andrew John Hughes wrote:
> > Interestingly, I don't think these tests are in OJ7.  At least, I
> > don't recall seeing these failures.
> 
> The files are certainly there under 7, and they are removed by the
> fsg.sh script. The Generation and Validation Tests that use them are
> also there. I'll do a build and a make check to see what is happening
> there.

How strange, these tests are there, but aren't run by our make check
jtreg run:

fail   ---    javax/xml/crypto/dsig/GenerationTests.java
fail   ---    javax/xml/crypto/dsig/ValidationTests.java
pass   ---    javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java

But this one is run:

javax/xml/crypto/dsig/SecurityManager/XMLDSigWithSecMgr.java
Passed. Execution successful

Puzzling...

After some testing I found it comes from the usage of -ignore:quiet
And that is probably the hint we need, because the new jtreg release
notes said: "Reduce false positives when setting keywords from test
description."

Indeed, using the jtreg embedded in icedtea6 inside icedtea[7] fixes it.
Most likely this was caused by the usage of -XDignore.symbol.file inside
the GenerationTests.java and ValidationTests.java files.

So, please forward port the jtreg changed from icedtea6 to icedtea[7],
then you can see these two tests also fail :)

This was the patch that added the new jtreg to icedtea6:
http://icedtea.classpath.org/hg/icedtea6/rev/76b5306fead0
(To see the fix, search for IGNORE_ACTION)
You will also want the -samevm support for langtools to make things go
much quicker:
http://icedtea.classpath.org/hg/icedtea6/rev/688efd120766

Cheers.

Mark



From Joe.Darcy at Sun.COM  Sun Nov 16 22:03:24 2008
From: Joe.Darcy at Sun.COM (Joseph D. Darcy)
Date: Sun, 16 Nov 2008 22:03:24 -0800
Subject: sun proprietary/confidential JarFromManifestFailure.java in
	openjdk6
In-Reply-To: <49207EA0.80803@sun.com>
References: <1226839334.26105.15.camel@hermans.wildebeest.org>
	<49207EA0.80803@sun.com>
Message-ID: <4921092C.3020808@sun.com>

Joseph D. Darcy wrote:
> Hello.
>
> Mark Wielaard wrote:
>> Hi,
>>
>> I just filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=258
>>
>> In jdk6 
>> langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java is
>> marked as "SUN PROPRIETARY/CONFIDENTIAL" while the version in jdk7 is 
>> under the
>> GPL.
>>
>> The version in jdk7 was alsways under the GPL, and never marked as
>> proprietary, but the version as imported in jdk6-b05 and updated in
>> jdk6-b13 was.
>>   
>
> Sorry about that; I've filed Sun bug 6772068 for this issue and it 
> will be fixed in the next OpenJDK 6 build.
>
> -Joe
>
>

The bug is now fixed in the upstream OpenJDK 6 sources; below is the patch.

Cheers,

-Joe

--- old/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Sun Nov 16 15:47:52 2008
+++ new/test/tools/javac/Paths/6638501/JarFromManifestFailure.java	Sun Nov 16 15:47:51 2008
@@ -1,6 +1,24 @@
 /*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  */
 
 /*
@@ -31,10 +49,11 @@
         arList.add(new File("HelloLib.jar"));
         jar(new File(libFile, "JarPointer.jar"), arList, testClasses);
 
-        String [] args1 = new String[3];
-        args1[0] = "-cp";
-        args1[1] = new File(libFile, "JarPointer.jar").toString().replace('\\', '/');
-        args1[2] = new File(testSrc, "test/SayHello.java").toString().replace('\\', '/');
+        String[] args1 = {
+            "-d", ".",
+            "-cp", new File(libFile, "JarPointer.jar").getPath().replace('\\', '/'),
+            new File(testSrc, "test/SayHello.java").getPath().replace('\\', '/')
+        };
         System.err.println("First compile!!!");
         if (com.sun.tools.javac.Main.compile(args1) != 0) {
             throw new AssertionError("Failure in first compile!");
@@ -42,10 +61,11 @@
 
         System.err.println("Second compile!!!");
 
-        args1 = new String[3];
-        args1[0] = "-cp";
-        args1[1] = new File(libFile, "JarPointer.jar").toString().replace('\\', '/');
-        args1[2] = new File(testSrc, "test1/SayHelloToo.java").toString().replace('\\', '/');
+        args1 = new String[] {
+            "-d", ".",
+            "-cp", new File(libFile, "JarPointer.jar").getPath().replace('\\', '/'),
+            new File(testSrc, "test1/SayHelloToo.java").getPath().replace('\\', '/')
+        };
         if (com.sun.tools.javac.Main.compile(args1) != 0) {
             throw new AssertionError("Failure in second compile!");
         }
--- old/test/tools/javac/Paths/6638501/WsCompileExample.java	Sun Nov 16 15:48:05 2008
+++ new/test/tools/javac/Paths/6638501/WsCompileExample.java	Sun Nov 16 15:48:05 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
 import java.util.List;
 import java.util.ArrayList;
 import java.io.File;
--- old/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java	Sun Nov 16 15:48:07 2008
+++ new/test/tools/javac/Paths/6638501/HelloLib/test/HelloImpl.java	Sun Nov 16 15:48:06 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
 package test;
 
 public class HelloImpl {
--- old/test/tools/javac/Paths/6638501/test/SayHello.java	Sun Nov 16 15:48:08 2008
+++ new/test/tools/javac/Paths/6638501/test/SayHello.java	Sun Nov 16 15:48:08 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
 import test.HelloImpl;
 
 public class SayHello extends HelloImpl {
--- old/test/tools/javac/Paths/6638501/test1/SayHelloToo.java	Sun Nov 16 15:48:09 2008
+++ new/test/tools/javac/Paths/6638501/test1/SayHelloToo.java	Sun Nov 16 15:48:09 2008
@@ -1,3 +1,26 @@
+/*
+ * Copyright 2007-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
 import test.HelloImpl;
 
 public class SayHelloToo extends HelloImpl {




From doko at ubuntu.com  Mon Nov 17 00:30:02 2008
From: doko at ubuntu.com (doko at ubuntu.com)
Date: Mon, 17 Nov 2008 08:30:02 +0000
Subject: changeset in /hg/icedtea6: 2008-11-17  Matthias Klose  <doko@ubu...
Message-ID: <hg.3d0cabbaa2b3.1226910602.2873452341184383832@icedtea.classpath.org>

changeset 3d0cabbaa2b3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3d0cabbaa2b3
description:
	2008-11-17  Matthias Klose  <doko at ubuntu.com>

	        * fsg.sh: Don't remove xml-stylesheet files.

diffstat:

2 files changed, 4 insertions(+), 5 deletions(-)
ChangeLog |    4 ++++
fsg.sh    |    5 -----

diffs (25 lines):

diff -r 66a924d864e4 -r 3d0cabbaa2b3 ChangeLog
--- a/ChangeLog	Sun Nov 16 00:05:59 2008 +0100
+++ b/ChangeLog	Mon Nov 17 09:29:48 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-15  Mark Wielaard  <mark at klomp.o
+2008-11-17  Matthias Klose  <doko at ubuntu.com>
+
+	* fsg.sh: Don't remove xml-stylesheet files.
+
 2008-11-15  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-testenv.patch: New patch.
diff -r 66a924d864e4 -r 3d0cabbaa2b3 fsg.sh
--- a/fsg.sh	Sun Nov 16 00:05:59 2008 +0100
+++ b/fsg.sh	Mon Nov 17 09:29:48 2008 +0100
@@ -82,10 +82,5 @@ rm -f \
 rm -f \
   openjdk/jdk/test/sun/net/idn/*.spp
 
-# has w3c copyright. license to be checked / needs checking after decoding
-rm -f \
-  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
-  openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64
-
 # END Debian/Ubuntu additions
 


From doko at ubuntu.com  Mon Nov 17 00:30:44 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Mon, 17 Nov 2008 09:30:44 +0100
Subject: xml-stylesheet data files usage in tests removed by fsg.sh
In-Reply-To: <1226758506.16426.54.camel@hermans.wildebeest.org>
References: <1226758506.16426.54.camel@hermans.wildebeest.org>
Message-ID: <49212BB4.60207@ubuntu.com>

Mark Wielaard schrieb:
> Hi.
> 
> The IcedTea fsg.sh (Free Software Guidelines) script that scrubs any
> dubious contents from the files distributed through OpenJDK has the
> following:
> 
> # has w3c copyright. license to be checked / needs checking after decoding
> rm -f \
>   openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet \
>   openjdk/jdk/test/javax/xml/crypto/dsig/data/xml-stylesheet.b64
> 
> These files are local copies of the following files:
> http://www.w3.org/TR/xml-stylesheet
> http://www.w3.org/Signature/2002/04/xml-stylesheet.b64
> (The second is a base64 encoded version of the first.)
> 
> These files are used in the following tests:
> openjdk/jdk/test/javax/xml/crypto/dsig/GenerationTests.java
> openjdk/jdk/test/javax/xml/crypto/dsig/ValidationTests.java
> (Which currently obviously fail without those files in the data dir)
> 
> These tests references the merlin-xmldsig-twenty-three Baltimore test
> vectors (also distributed by the w3c):
> http://www.w3.org/Signature/2001/04/05-xmldsig-interop.html
> 
> The xml-stylesheet file references:
> http://www.w3.org/Consortium/Legal/ipr-notice.html#Copyright and
> http://www.w3.org/Consortium/Legal/copyright-software.html
> Which seem to imply we may freely distribute them.
> 
> So I would like to remove these "cleanups" from fsg.sh.
> Opinions?

done. checked that the license is included in the third party readme as well.

  Matthias



From gnu_andrew at member.fsf.org  Mon Nov 17 04:41:24 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 12:41:24 +0000
Subject: changeset in /hg/icedtea: Change javac.in to use Perl in order t...
Message-ID: <hg.aa31b5aaa586.1226925684.-6899778133799504387@icedtea.classpath.org>

changeset aa31b5aaa586 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aa31b5aaa586
description:
	Change javac.in to use Perl in order to avoid quoting issues.

	2008-11-10  Andrew John Hughes  <ahughes at redhat.com>

		* javac.in:
		Update with native ecj changes.

	2008-09-18  C. K. Jester-Young  <cky944 at gmail.com>

		* javac.in:
		Convert to Perl script to avoid
		quoting errors.

diffstat:

2 files changed, 43 insertions(+), 29 deletions(-)
ChangeLog |   11 +++++++++++
javac.in  |   61 ++++++++++++++++++++++++++++++++-----------------------------

diffs (93 lines):

diff -r 5b53866e4134 -r aa31b5aaa586 ChangeLog
--- a/ChangeLog	Mon Nov 10 02:53:23 2008 +0000
+++ b/ChangeLog	Tue Nov 11 00:07:06 2008 +0000
@@ -1,3 +1,14 @@ 2008-11-10  Andrew John Hughes  <ahughes
+2008-11-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* javac.in:
+	Update with native ecj changes.
+
+2008-09-18  C. K. Jester-Young  <cky944 at gmail.com>
+
+	* javac.in:
+	Convert to Perl script to avoid
+	quoting errors.
+	
 2008-11-10  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Fix make dist.
diff -r 5b53866e4134 -r aa31b5aaa586 javac.in
--- a/javac.in	Mon Nov 10 02:53:23 2008 +0000
+++ b/javac.in	Tue Nov 11 00:07:06 2008 +0000
@@ -1,39 +1,42 @@
-#!/bin/sh
+#!/usr/bin/perl -w
+use strict;
+use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
+use constant STRIP_ARGS => qw(-Werror);
 
-case "$*" in
-  *-bootclasspath*) ;;
-  *) bcoption="-bootclasspath @LIBGCJ_JAR@"
-esac
+my @bcoption;
+push @bcoption, '-bootclasspath', glob '@LIBGCJ_JAR@'
+    unless grep {$_ eq '-bootclasspath'} @ARGV;
 
 # Work around ecj's inability to handle duplicate command-line
 # options.
 
-NEW_ARGS="$@"
+my @new_args = @ARGV;
 
-if echo "$@" | grep -q '\-source\ .*\-source\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-source\ *1\.[3456]//1'`
-fi
+for my $opt (NO_DUP_ARGS) 
+{
+    my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+    if (@indices > 1) {
+        shift @indices;    # keep last instance only
+        splice @new_args, $_, 2 for @indices;
+    }
+}
 
-if echo "$@" | grep -q '\-d\ .*\-d\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-d\ *[^\ ]*//1'`
-fi
+for my $opt (STRIP_ARGS) 
+{
+    my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
+    splice @new_args, $_, 1 for @indices;
+}
 
-if echo "$@" | grep -q '\-encoding\ .*\-encoding\ '
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-encoding\ *[^\ ]*//1'`
-fi
+my @CLASSPATH = ('@ECJ_JAR@');
+push @CLASSPATH, split /:/, $ENV{CLASSPATH} if exists $ENV{CLASSPATH};
+$ENV{CLASSPATH} = join ':', @CLASSPATH;
 
-if echo "$@" | grep -q '\-Werror'
-then
-  NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-Werror//1'`
-fi
-
-if [ -e @abs_top_builddir@/native-ecj ] ; then
-    @abs_top_builddir@/native-ecj -1.5 -nowarn $bcoption $NEW_ARGS ;
+if ( -e "@abs_top_builddir@/native-ecj" )
+{
+    exec '@abs_top_builddir@/native-ecj', '-1.5', '-nowarn', @bcoption, @new_args ;
+}
 else
-    CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
-     @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
-fi
-
+{
+    exec '@JAVA@', 'org.eclipse.jdt.internal.compiler.batch.Main', '-1.5',
+    '-nowarn', @bcoption, @new_args;
+}


From gnu_andrew at member.fsf.org  Mon Nov 17 04:41:25 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 12:41:25 +0000
Subject: changeset in /hg/icedtea: Cleanup binary plugs / proprietary stu...
Message-ID: <hg.3d692e2fa547.1226925685.-6899778133799504387@icedtea.classpath.org>

changeset 3d692e2fa547 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3d692e2fa547
description:
	Cleanup binary plugs / proprietary stub support.

	2008-11-14  Andrew John Hughes  <ahughes at redhat.com>

		* HACKING: List new plugs patches.
		* Makefile.am: Remove use of rt from source dir,
		remove redundant Gervill patch, add new patches.
		* fsg.sh: Remove code related to proprietary sound
		and SNMP support.
		* patches/icedtea-copy-plugs.patch: Remove SNMP patch.
		* patches/icedtea-gervill.patch: Removed.
		* patches/icedtea-jsoundhs.patch: No need to patch services.
		* patches/icedtea-snmp.patch,
		* patches/icedtea-sound.patch: Remove references to proprietary code.
		* rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java,
		* rt/com/sun/jmx/snmp/SnmpDefinitions.java,
		* rt/com/sun/jmx/snmp/SnmpOid.java,
		* rt/com/sun/jmx/snmp/SnmpOidRecord.java,
		* rt/com/sun/jmx/snmp/SnmpOidTable.java,
		* rt/com/sun/jmx/snmp/SnmpOidTableSupport.java,
		* rt/com/sun/jmx/snmp/SnmpParameters.java,
		* rt/com/sun/jmx/snmp/SnmpPduPacket.java,
		* rt/com/sun/jmx/snmp/SnmpPeer.java,
		* rt/com/sun/jmx/snmp/SnmpSession.java,
		* rt/com/sun/jmx/snmp/SnmpTimeticks.java,
		* rt/com/sun/jmx/snmp/SnmpVarBind.java,
		* rt/com/sun/jmx/snmp/SnmpVarBindList.java,
		* rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java,
		* rt/com/sun/jmx/snmp/daemon/SnmpSession.java,
		* rt/com/sun/media/sound/AbstractPlayer.java,
		* rt/com/sun/media/sound/HeadspaceMixer.java,
		* rt/com/sun/media/sound/HeadspaceSoundbank.java,
		* rt/com/sun/media/sound/MixerClip.java,
		* rt/com/sun/media/sound/MixerMidiChannel.java,
		* rt/com/sun/media/sound/MixerSequencer.java,
		* rt/com/sun/media/sound/MixerSourceLine.java,
		* rt/com/sun/media/sound/MixerSynth.java,
		* rt/com/sun/media/sound/MixerThread.java,
		* rt/com/sun/media/sound/SimpleInputDevice.java,
		* rt/com/sun/media/sound/SimpleInputDeviceProvider.java:
		Remove redundant stubs.

diffstat:

35 files changed, 987 insertions(+), 1746 deletions(-)
ChangeLog                                             |   40 
HACKING                                               |    2 
Makefile.am                                           |   10 
fsg.sh                                                |   11 
patches/icedtea-copy-plugs.patch                      |   13 
patches/icedtea-gervill.patch                         |   11 
patches/icedtea-jsoundhs.patch                        |   10 
patches/icedtea-snmp.patch                            |  235 +++++
patches/icedtea-sound.patch                           |  693 +++++++++++++++++
rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java            |   52 -
rt/com/sun/jmx/snmp/SnmpDefinitions.java              |   83 --
rt/com/sun/jmx/snmp/SnmpOid.java                      |  137 ---
rt/com/sun/jmx/snmp/SnmpOidRecord.java                |   53 -
rt/com/sun/jmx/snmp/SnmpOidTable.java                 |   53 -
rt/com/sun/jmx/snmp/SnmpOidTableSupport.java          |   54 -
rt/com/sun/jmx/snmp/SnmpParameters.java               |   60 -
rt/com/sun/jmx/snmp/SnmpPduPacket.java                |   52 -
rt/com/sun/jmx/snmp/SnmpPeer.java                     |   73 -
rt/com/sun/jmx/snmp/SnmpSession.java                  |   65 -
rt/com/sun/jmx/snmp/SnmpTimeticks.java                |   74 -
rt/com/sun/jmx/snmp/SnmpVarBind.java                  |   74 -
rt/com/sun/jmx/snmp/SnmpVarBindList.java              |   82 --
rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java     |   42 -
rt/com/sun/jmx/snmp/daemon/SnmpSession.java           |   66 -
rt/com/sun/media/sound/AbstractPlayer.java            |   45 -
rt/com/sun/media/sound/HeadspaceMixer.java            |   44 -
rt/com/sun/media/sound/HeadspaceSoundbank.java        |   45 -
rt/com/sun/media/sound/MixerClip.java                 |   44 -
rt/com/sun/media/sound/MixerMidiChannel.java          |   45 -
rt/com/sun/media/sound/MixerSequencer.java            |  233 -----
rt/com/sun/media/sound/MixerSourceLine.java           |   44 -
rt/com/sun/media/sound/MixerSynth.java                |   55 -
rt/com/sun/media/sound/MixerThread.java               |   44 -
rt/com/sun/media/sound/SimpleInputDevice.java         |   44 -
rt/com/sun/media/sound/SimpleInputDeviceProvider.java |   45 -

diffs (truncated from 2935 to 500 lines):

diff -r aa31b5aaa586 -r 3d692e2fa547 ChangeLog
--- a/ChangeLog	Tue Nov 11 00:07:06 2008 +0000
+++ b/ChangeLog	Fri Nov 14 04:24:08 2008 +0000
@@ -1,3 +1,43 @@ 2008-11-10  Andrew John Hughes  <ahughes
+2008-11-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* HACKING: List new plugs patches.
+	* Makefile.am: Remove use of rt from source dir,
+	remove redundant Gervill patch, add new patches.
+	* fsg.sh: Remove code related to proprietary sound
+	and SNMP support.
+	* patches/icedtea-copy-plugs.patch: Remove SNMP patch.
+	* patches/icedtea-gervill.patch: Removed.
+	* patches/icedtea-jsoundhs.patch: No need to patch services.
+	* patches/icedtea-snmp.patch,
+	* patches/icedtea-sound.patch: Remove references to proprietary code.
+	* rt/com/sun/jmx/snmp/SnmpDataTypeEnums.java,
+	* rt/com/sun/jmx/snmp/SnmpDefinitions.java,
+	* rt/com/sun/jmx/snmp/SnmpOid.java,
+	* rt/com/sun/jmx/snmp/SnmpOidRecord.java,
+	* rt/com/sun/jmx/snmp/SnmpOidTable.java,
+	* rt/com/sun/jmx/snmp/SnmpOidTableSupport.java,
+	* rt/com/sun/jmx/snmp/SnmpParameters.java,
+	* rt/com/sun/jmx/snmp/SnmpPduPacket.java,
+	* rt/com/sun/jmx/snmp/SnmpPeer.java,
+	* rt/com/sun/jmx/snmp/SnmpSession.java,
+	* rt/com/sun/jmx/snmp/SnmpTimeticks.java,
+	* rt/com/sun/jmx/snmp/SnmpVarBind.java,
+	* rt/com/sun/jmx/snmp/SnmpVarBindList.java,
+	* rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java,
+	* rt/com/sun/jmx/snmp/daemon/SnmpSession.java,
+	* rt/com/sun/media/sound/AbstractPlayer.java,
+	* rt/com/sun/media/sound/HeadspaceMixer.java,
+	* rt/com/sun/media/sound/HeadspaceSoundbank.java,
+	* rt/com/sun/media/sound/MixerClip.java,
+	* rt/com/sun/media/sound/MixerMidiChannel.java,
+	* rt/com/sun/media/sound/MixerSequencer.java,
+	* rt/com/sun/media/sound/MixerSourceLine.java,
+	* rt/com/sun/media/sound/MixerSynth.java,
+	* rt/com/sun/media/sound/MixerThread.java,
+	* rt/com/sun/media/sound/SimpleInputDevice.java,
+	* rt/com/sun/media/sound/SimpleInputDeviceProvider.java:
+	Remove redundant stubs.
+
 2008-11-10  Andrew John Hughes  <ahughes at redhat.com>
 
 	* javac.in:
diff -r aa31b5aaa586 -r 3d692e2fa547 HACKING
--- a/HACKING	Tue Nov 11 00:07:06 2008 +0000
+++ b/HACKING	Fri Nov 14 04:24:08 2008 +0000
@@ -89,6 +89,8 @@ The following patches are only applied t
   is broken in libgcj 4.3.
 * icedtea-override.patch: Remove @Override annotation in
   javax.management.AttributeValueExp (unsupported by ecj < 3.4).
+* icedtea-snmp.patch: Remove proprietary SNMP support hooks.
+* icedtea-sound.patch: Remove proprietary MIDI support hooks.
 
 The following patches are only applied to the icedtea-ecj bootstrap tree:
 
diff -r aa31b5aaa586 -r 3d692e2fa547 Makefile.am
--- a/Makefile.am	Tue Nov 11 00:07:06 2008 +0000
+++ b/Makefile.am	Fri Nov 14 04:24:08 2008 +0000
@@ -89,7 +89,7 @@ install:
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
 	clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
 
-EXTRA_DIST = rt generated $(abs_top_srcdir)/patches/icedtea-*.patch \
+EXTRA_DIST = generated $(abs_top_srcdir)/patches/icedtea-*.patch \
 	gcjwebplugin.cc tools-copy contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
@@ -552,7 +552,6 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-uname.patch \
 	patches/icedtea-ia64-fdlibm.patch \
 	patches/icedtea-fonts.patch \
-	patches/icedtea-gervill.patch \
 	patches/icedtea-directaudio-close-trick.patch \
 	patches/icedtea-sparc64-linux.patch \
 	patches/icedtea-sparc-ptracefix.patch \
@@ -583,6 +582,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
+	patches/icedtea-snmp.patch \
+	patches/icedtea-sound.patch \
 	$(ZERO_PATCHES_COND)
 
 if WITH_RHINO
@@ -1302,7 +1303,6 @@ ICEDTEA_COPY_DIRS = \
 	com/sun/jdi/connect/spi \
 	com/sun/jdi/event \
 	com/sun/jdi/request \
-	com/sun/jmx/snmp/agent \
 	com/sun/tools/jdi \
 	com/sun/net/httpserver \
 	java/io \
@@ -1377,7 +1377,7 @@ hotspot-tools-source-files.txt: stamps/g
 	find hotspot-tools -name '*.java' | sort > $@
 	mkdir -p lib/hotspot-tools
 
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_srcdir)/rt
+ABS_SOURCE_DIRS = $(abs_top_builddir)/generated
 stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
@@ -1426,7 +1426,7 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: st
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' \
+	find $(abs_top_builddir)/rt -name '*.java' \
 	  | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt
diff -r aa31b5aaa586 -r 3d692e2fa547 fsg.sh
--- a/fsg.sh	Tue Nov 11 00:07:06 2008 +0000
+++ b/fsg.sh	Fri Nov 14 04:24:08 2008 +0000
@@ -102,3 +102,14 @@ rm -f \
 
 # END Debian/Ubuntu additions
 
+# Remove support for proprietary SNMP plug
+rm -rf openjdk/jdk/src/share/classes/sun/management/snmp
+rm -rf openjdk/jdk/src/share/classes/com/sun/jmx/snmp
+
+# Remove support for proprietary sound
+rm -rf openjdk/jdk/src/share/classes/com/sun/media/sound/services
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/MixerSynthProvider.java
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/RmfFileReader.java
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/HsbParser.java
+rm -f openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInputDeviceProvider.java
+
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-copy-plugs.patch
--- a/patches/icedtea-copy-plugs.patch	Tue Nov 11 00:07:06 2008 +0000
+++ b/patches/icedtea-copy-plugs.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -48,19 +48,6 @@ diff -Nru openjdk.orig/jdk/make/common/i
  ($(CD) $(CLASSDESTDIR) && $(java-vm-cleanup) )
  endef # import-binary-plug-classes
  
-diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java
---- openjdk.orig/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-08-14 08:42:55.000000000 +0100
-+++ openjdk/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java	2008-08-20 22:55:35.000000000 +0100
-@@ -78,6 +78,9 @@
-      */
-     public long            timeStamp ;
- 
-+    // TODO: IcedTea: I am a stub.
-+    static public int trapAuthenticationFailure = 0;
-+
- 
- 
-     /**
 diff -Nru openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java openjdk/jdk/src/share/classes/java/beans/MetaData.java
 --- openjdk.orig/jdk/src/share/classes/java/beans/MetaData.java	2008-08-14 08:43:00.000000000 +0100
 +++ openjdk/jdk/src/share/classes/java/beans/MetaData.java	2008-08-20 22:55:35.000000000 +0100
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-gervill.patch
--- a/patches/icedtea-gervill.patch	Tue Nov 11 00:07:06 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# Adds the provides defined by gervill (and removes non-existing ones).
-# Gervill can be found in the overlays under
-# openjdk/jdk/src/share/classes/com/sun/media/sound
-# (This currently overrides the one from b10 because we track Gervill CVS)
---- /home/mark/src/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-04-13 01:05:30.000000000 +0200
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	2008-05-09 02:54:26.000000000 +0200
-@@ -2,3 +2,4 @@
- com.sun.media.sound.UlawCodec
- com.sun.media.sound.AlawCodec
- com.sun.media.sound.PCMtoPCMCodec
-+com.sun.media.sound.AudioFloatFormatConverter
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-jsoundhs.patch
--- a/patches/icedtea-jsoundhs.patch	Tue Nov 11 00:07:06 2008 +0000
+++ b/patches/icedtea-jsoundhs.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -70,12 +70,4 @@ diff -uNr openjdk-orig/jdk/src/share/cla
              // just for the heck of it...
              loadedLibs |= LIB_MAIN;
          } catch (SecurityException e) {
-diff -uNr openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
---- openjdk-orig/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:38:15.000000000 -0500
-+++ openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	2008-11-07 10:43:38.000000000 -0500
-@@ -1,5 +1,4 @@
- # last mixer is default mixer
- com.sun.media.sound.PortMixerProvider
- com.sun.media.sound.SimpleInputDeviceProvider
--com.sun.media.sound.HeadspaceMixerProvider
- com.sun.media.sound.DirectAudioDeviceProvider
+
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-snmp.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-snmp.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -0,0 +1,235 @@
+diff -Nru openjdk.orig/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile
+--- openjdk.orig/jdk/make/com/sun/jmx/Makefile	2008-11-11 01:22:14.000000000 +0000
++++ openjdk/jdk/make/com/sun/jmx/Makefile	2008-11-11 01:24:31.000000000 +0000
+@@ -41,7 +41,7 @@
+ # Note : some targets are double colon rules and some single colon rules
+ # within common included gmk files : that is why the following for loop
+ # has been duplicated.
+-SUBDIRS = snmp
++SUBDIRS = 
+ 
+ all build:
+ 	$(SUBDIRS-loop)
+diff -Nru openjdk.orig/jdk/make/com/sun/jmx/snmp/Makefile openjdk/jdk/make/com/sun/jmx/snmp/Makefile
+--- openjdk.orig/jdk/make/com/sun/jmx/snmp/Makefile	2008-11-11 01:22:23.000000000 +0000
++++ openjdk/jdk/make/com/sun/jmx/snmp/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,45 +0,0 @@
+-#
+-# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.  Sun designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Sun in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+-# CA 95054 USA or visit www.sun.com if you need additional information or
+-# have any questions.
+-#
+-
+-#
+-# Makefile for building SNMP runtime support for
+-# Sun-specific JDK out of the box management support.
+-#
+-
+-BUILDDIR = ../../../..
+-PACKAGE = com.sun.jmx.snmp
+-PRODUCT = sun
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Files to compile
+-#
+-AUTO_FILES_JAVA_DIRS = com/sun/jmx/snmp
+-
+-#
+-# Rules
+-#
+-include $(BUILDDIR)/common/Classes.gmk
+-
+diff -Nru openjdk.orig/jdk/make/docs/Makefile openjdk/jdk/make/docs/Makefile
+--- openjdk.orig/jdk/make/docs/Makefile	2008-11-11 01:23:00.000000000 +0000
++++ openjdk/jdk/make/docs/Makefile	2008-11-11 01:26:08.000000000 +0000
+@@ -328,14 +328,8 @@
+ MGMT_DOCDIR	   = $(DOCSDIR)/jre/api/management/
+ MGMT_EXT_DIR	   = $(MGMT_DOCDIR)/extension
+ MGMT_SOURCEPATH    = $(TOPDIR)/src/share/classes
+-JVM_MIB_NAME       = JVM-MANAGEMENT-MIB.mib
+-JVM_MIB_SRC        = $(CLOSED_SRC)/share/classes/sun/management/snmp/$(JVM_MIB_NAME)
+ 
+-ifdef OPENJDK
+-   COPY-MIB-TARGET =
+-else
+-   COPY-MIB-TARGET = copy-mib
+-endif
++COPY-MIB-TARGET =
+ MGMT_JAVADOCFLAGS  = $(COMMON_JAVADOCFLAGS)			   \
+ 		     -encoding ascii			           \
+                      -nodeprecatedlist                             \
+@@ -632,12 +626,6 @@
+ 	$(JAVADOC_CMD) $(MGMT_JAVADOCFLAGS)                     \
+ 		   $(MGMT_PKGS)
+ 
+-copy-mib:
+-	@# ######## copy-snmp-mib ############################
+-	$(RM) $(MGMT_DOCDIR)/$(JVM_MIB_NAME)
+-	$(MKDIR) -p $(MGMT_DOCDIR)
+-	$(CP) $(JVM_MIB_SRC) $(MGMT_DOCDIR)
+-
+ .PHONY: attachdocs
+ attachdocs:
+ 	@# ######## api-attach ############################
+diff -Nru openjdk.orig/jdk/make/sun/management/Makefile openjdk/jdk/make/sun/management/Makefile
+--- openjdk.orig/jdk/make/sun/management/Makefile	2008-11-11 01:22:47.000000000 +0000
++++ openjdk/jdk/make/sun/management/Makefile	2008-11-11 01:25:00.000000000 +0000
+@@ -33,26 +33,20 @@
+ MGMT_LIBDIR = $(LIBDIR)/management
+ MGMT_LIB_SRC = $(SHARE_SRC)/lib/management
+ 
+-all build:: properties aclfile jmxremotefiles
++all build:: properties jmxremotefiles
+ 
+-SUBDIRS = snmp jmxremote
++SUBDIRS = jmxremote
+ all build clean clobber::
+ 	$(SUBDIRS-loop)
+ 
+ properties: $(MGMT_LIBDIR)/management.properties
+ 
+-aclfile: $(MGMT_LIBDIR)/snmp.acl.template
+-
+ jmxremotefiles: $(MGMT_LIBDIR)/jmxremote.password.template $(MGMT_LIBDIR)/jmxremote.access
+ 
+ $(MGMT_LIBDIR)/management.properties: $(MGMT_LIB_SRC)/management.properties
+ 	$(install-file)
+ 	$(CHMOD) 644 $@
+ 
+-$(MGMT_LIBDIR)/snmp.acl.template: $(MGMT_LIB_SRC)/snmp.acl.template
+-	$(install-file)
+-	$(CHMOD) 444 $@
+-
+ $(MGMT_LIBDIR)/jmxremote.password.template: $(MGMT_LIB_SRC)/jmxremote.password.template
+ 	$(install-file)
+ 	$(CHMOD) 444 $@
+diff -Nru openjdk.orig/jdk/make/sun/management/snmp/Makefile openjdk/jdk/make/sun/management/snmp/Makefile
+--- openjdk.orig/jdk/make/sun/management/snmp/Makefile	2008-11-11 01:22:41.000000000 +0000
++++ openjdk/jdk/make/sun/management/snmp/Makefile	1970-01-01 01:00:00.000000000 +0100
+@@ -1,44 +0,0 @@
+-#
+-# Copyright 2003-2005 Sun Microsystems, Inc.  All Rights Reserved.
+-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-#
+-# This code is free software; you can redistribute it and/or modify it
+-# under the terms of the GNU General Public License version 2 only, as
+-# published by the Free Software Foundation.  Sun designates this
+-# particular file as subject to the "Classpath" exception as provided
+-# by Sun in the LICENSE file that accompanied this code.
+-#
+-# This code is distributed in the hope that it will be useful, but WITHOUT
+-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+-# version 2 for more details (a copy is included in the LICENSE file that
+-# accompanied this code).
+-#
+-# You should have received a copy of the GNU General Public License version
+-# 2 along with this work; if not, write to the Free Software Foundation,
+-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-#
+-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+-# CA 95054 USA or visit www.sun.com if you need additional information or
+-# have any questions.
+-#
+-
+-#
+-# Makefile for building SNMP MIB instrumentation
+-#
+-
+-BUILDDIR = ../../..
+-PACKAGE = sun.management.snmp
+-PRODUCT = sun
+-include $(BUILDDIR)/common/Defs.gmk
+-
+-#
+-# Files to compile
+-#
+-AUTO_FILES_JAVA_DIRS = sun/management/snmp
+-
+-#
+-# Rules
+-#
+-include $(BUILDDIR)/common/Classes.gmk
+-
+diff -Nru openjdk.orig/jdk/src/share/classes/sun/management/Agent.java openjdk/jdk/src/share/classes/sun/management/Agent.java
+--- openjdk.orig/jdk/src/share/classes/sun/management/Agent.java	2008-11-11 01:45:39.000000000 +0000
++++ openjdk/jdk/src/share/classes/sun/management/Agent.java	2008-11-11 01:46:56.000000000 +0000
+@@ -41,15 +41,13 @@
+ 
+ import javax.management.remote.JMXConnectorServer;
+ 
+-import sun.management.snmp.AdaptorBootstrap;
+ import sun.management.jmxremote.ConnectorBootstrap;
+ import static sun.management.AgentConfigurationError.*;
+ import sun.misc.VMSupport;
+ 
+ /**
+- * This Agent is started by the VM when -Dcom.sun.management.snmp
+- * or -Dcom.sun.management.jmxremote is set. This class will be
+- * loaded by the system class loader.
++ * This Agent is started by the VM when -Dcom.sun.management.jmxremote
++ * is set. This class will be loaded by the system class loader.
+  */
+ public class Agent {
+     // management properties
+@@ -58,8 +56,6 @@
+ 
+     private static final String CONFIG_FILE =
+         "com.sun.management.config.file";
+-    private static final String SNMP_PORT =
+-        "com.sun.management.snmp.port";
+     private static final String JMXREMOTE =
+         "com.sun.management.jmxremote";
+     private static final String JMXREMOTE_PORT =
+@@ -114,7 +110,6 @@
+     }
+ 
+     private static void startAgent(Properties props) throws Exception {
+-        String snmpPort = props.getProperty(SNMP_PORT);
+         String jmxremote = props.getProperty(JMXREMOTE);
+         String jmxremotePort = props.getProperty(JMXREMOTE_PORT);
+ 
+@@ -127,10 +122,6 @@
+         }
+ 
+         try {
+-            if (snmpPort != null) {
+-                AdaptorBootstrap.initialize(snmpPort, props);
+-            }
+-
+             /*
+              * If the jmxremote.port property is set then we start the
+              * RMIConnectorServer for remote M&M.
+@@ -190,11 +181,10 @@
+     public static synchronized Properties getManagementProperties() {
+         if (mgmtProps == null) {
+             String configFile = System.getProperty(CONFIG_FILE);
+-            String snmpPort = System.getProperty(SNMP_PORT);
+             String jmxremote = System.getProperty(JMXREMOTE);
+             String jmxremotePort = System.getProperty(JMXREMOTE_PORT);
+ 
+-            if (configFile == null && snmpPort == null &&
++            if (configFile == null &&
+                 jmxremote == null && jmxremotePort == null) {
+                 // return if out-of-the-management option is not specified
+                 return null;
diff -r aa31b5aaa586 -r 3d692e2fa547 patches/icedtea-sound.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-sound.patch	Fri Nov 14 04:24:08 2008 +0000
@@ -0,0 +1,693 @@
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java openjdk/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java	2008-11-13 18:27:19.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/AbstractMidiDevice.java	2008-11-13 18:27:03.000000000 +0000
+@@ -586,7 +586,6 @@
+ 
+         private ArrayList<Transmitter> transmitters = new ArrayList<Transmitter>();
+         private MidiOutDevice.MidiOutReceiver midiOutReceiver;
+-        private MixerSynth.SynthReceiver mixerSynthReceiver;
+ 
+         // how many transmitters must be present for optimized
+         // handling
+@@ -621,22 +620,14 @@
+                 if (midiOutReceiver == oldR) {
+                     midiOutReceiver = null;
+                 }
+-                if (mixerSynthReceiver == oldR) {
+-                    mixerSynthReceiver = null;
+-                }
+                 if (newR != null) {
+                     if ((newR instanceof MidiOutDevice.MidiOutReceiver)
+                         && (midiOutReceiver == null)) {
+                         midiOutReceiver = ((MidiOutDevice.MidiOutReceiver) newR);
+                     }
+-                    if ((newR instanceof MixerSynth.SynthReceiver)
+-                        && (mixerSynthReceiver == null)) {
+-                        mixerSynthReceiver = ((MixerSynth.SynthReceiver) newR);
+-                    }
+                 }
+                 optimizedReceiverCount =
+-                      ((midiOutReceiver!=null)?1:0)
+-                    + ((mixerSynthReceiver!=null)?1:0);
++		  ((midiOutReceiver!=null)?1:0);
+             }
+             // more potential for optimization here
+         }
+@@ -670,10 +661,6 @@
+                             if (TRACE_TRANSMITTER) Printer.println("Sending packed message to MidiOutReceiver");
+                             midiOutReceiver.sendPackedMidiMessage(packedMessage, timeStamp);
+                         }
+-                        if (mixerSynthReceiver != null) {
+-                            if (TRACE_TRANSMITTER) Printer.println("Sending packed message to MixerSynthReceiver");
+-                            mixerSynthReceiver.sendPackedMidiMessage(packedMessage, timeStamp);
+-                        }
+                     } else {
+                         if (TRACE_TRANSMITTER) Printer.println("Sending packed message to "+size+" transmitter's receivers");
+                         for (int i = 0; i < size; i++) {
+@@ -682,9 +669,6 @@
+                                 if (optimizedReceiverCount > 0) {
+                                     if (receiver instanceof MidiOutDevice.MidiOutReceiver) {
+                                         ((MidiOutDevice.MidiOutReceiver) receiver).sendPackedMidiMessage(packedMessage, timeStamp);
+-                                    }
+-                                    else if (receiver instanceof MixerSynth.SynthReceiver) {
+-                                        ((MixerSynth.SynthReceiver) receiver).sendPackedMidiMessage(packedMessage, timeStamp);
+                                     } else {
+                                         receiver.send(new FastShortMessage(packedMessage), timeStamp);
+                                     }
+@@ -739,10 +723,6 @@
+                         if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to MidiOutReceiver");
+                         midiOutReceiver.send(message, timeStamp);
+                     }
+-                    if (mixerSynthReceiver != null) {
+-                        if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to MixerSynthReceiver");
+-                        mixerSynthReceiver.send(message, timeStamp);
+-                    }
+                 } else {
+                     if (TRACE_TRANSMITTER) Printer.println("Sending MIDI message to "+size+" transmitter's receivers");
+                     for (int i = 0; i < size; i++) {
+diff -Nru openjdk.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java
+--- openjdk.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2008-11-13 18:27:30.000000000 +0000
++++ openjdk/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java	2008-11-13 18:26:52.000000000 +0000


From gnu_andrew at member.fsf.org  Mon Nov 17 04:41:24 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 12:41:24 +0000
Subject: changeset in /hg/icedtea: Fix make dist.
Message-ID: <hg.5b53866e4134.1226925684.-6899778133799504387@icedtea.classpath.org>

changeset 5b53866e4134 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5b53866e4134
description:
	Fix make dist.

	2008-11-10  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Fix make dist.

diffstat:

2 files changed, 5 insertions(+), 2 deletions(-)
ChangeLog   |    4 ++++
Makefile.am |    3 +--

diffs (24 lines):

diff -r 3c4aa7011748 -r 5b53866e4134 ChangeLog
--- a/ChangeLog	Mon Nov 10 01:38:03 2008 +0000
+++ b/ChangeLog	Mon Nov 10 02:53:23 2008 +0000
@@ -1,3 +1,7 @@ 2008-11-09  Andrew John Hughes  <ahughes
+2008-11-10  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Fix make dist.
+
 2008-11-09  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Bump to b39.
diff -r 3c4aa7011748 -r 5b53866e4134 Makefile.am
--- a/Makefile.am	Mon Nov 10 01:38:03 2008 +0000
+++ b/Makefile.am	Mon Nov 10 02:53:23 2008 +0000
@@ -89,8 +89,7 @@ install:
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
 	clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
 
-EXTRA_DIST = rt generated patches/openjdk-*.patch \
-	patches/icedtea-*.patch \
+EXTRA_DIST = rt generated $(abs_top_srcdir)/patches/icedtea-*.patch \
 	gcjwebplugin.cc tools-copy contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \


From gnu_andrew at member.fsf.org  Mon Nov 17 04:41:25 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 12:41:25 +0000
Subject: changeset in /hg/icedtea: Add missing property files.
Message-ID: <hg.be4b083df505.1226925685.-6899778133799504387@icedtea.classpath.org>

changeset be4b083df505 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=be4b083df505
description:
	Add missing property files.

	2008-11-14  Andrew John Hughes  <ahughes at redhat.com>

		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider,
		* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider:
		Add property files missed by hg.

diffstat:

12 files changed, 65 insertions(+)
ChangeLog                                                                                                              |   15 ++++++++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider            |    5 +++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader                |    2 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter                |    2 +
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader               |    5 +++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader            |    6 ++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter            |    4 ++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider   |    5 +++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider              |    3 ++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider   |    6 ++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider |    6 ++++
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider |    6 ++++

diffs (116 lines):

diff -r 3d692e2fa547 -r be4b083df505 ChangeLog
--- a/ChangeLog	Fri Nov 14 04:24:08 2008 +0000
+++ b/ChangeLog	Fri Nov 14 04:29:37 2008 +0000
@@ -1,3 +1,18 @@ 2008-11-14  Andrew John Hughes  <ahughes
+2008-11-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider,
+	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider:
+	Add property files missed by hg.
+
 2008-11-14  Andrew John Hughes  <ahughes at redhat.com>
 
 	* HACKING: List new plugs patches.
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,5 @@
+# Providers for midi devices
+com.sun.media.sound.RealTimeSequencerProvider
+com.sun.media.sound.MidiOutDeviceProvider
+com.sun.media.sound.MidiInDeviceProvider
+com.sun.media.sound.SoftProvider
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileReader	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,2 @@
+# Providers for midi sequences
+com.sun.media.sound.StandardMidiFileReader
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiFileWriter	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,2 @@
+# Providers for Midi file writing
+com.sun.media.sound.StandardMidiFileWriter
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.SoundbankReader	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,5 @@
+# Providers for Soundbanks
+com.sun.media.sound.SF2SoundbankReader
+com.sun.media.sound.DLSSoundbankReader
+com.sun.media.sound.AudioFileSoundbankReader
+com.sun.media.sound.JARSoundbankReader
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileReader	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,6 @@
+# Providers for audio file reading
+com.sun.media.sound.AuFileReader
+com.sun.media.sound.AiffFileReader
+com.sun.media.sound.WaveFileReader
+com.sun.media.sound.WaveFloatFileReader
+com.sun.media.sound.SoftMidiAudioFileReader
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.AudioFileWriter	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,4 @@
+# Providers for writing audio files
+com.sun.media.sound.AuFileWriter
+com.sun.media.sound.AiffFileWriter
+com.sun.media.sound.WaveFileWriter
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.FormatConversionProvider	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,5 @@
+# Providers for FormatConversion
+com.sun.media.sound.UlawCodec
+com.sun.media.sound.AlawCodec
+com.sun.media.sound.PCMtoPCMCodec
+com.sun.media.sound.AudioFloatFormatConverter
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.sampled.spi.MixerProvider	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,3 @@
+# last mixer is default mixer
+com.sun.media.sound.PortMixerProvider
+com.sun.media.sound.DirectAudioDeviceProvider
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/linux-i586/javax.sound.sampled.spi.MixerProvider	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,6 @@
+# service provider file for Linux: with DirectAudioDeviceProvider
+# last mixer is default mixer
+com.sun.media.sound.PortMixerProvider
+com.sun.media.sound.SimpleInputDeviceProvider
+com.sun.media.sound.DirectAudioDeviceProvider
+com.sun.media.sound.HeadspaceMixerProvider
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-i586/javax.sound.sampled.spi.MixerProvider	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,6 @@
+# service provider file for Windows: with DirectAudioDeviceProvider
+# last mixer is default mixer
+com.sun.media.sound.PortMixerProvider
+com.sun.media.sound.SimpleInputDeviceProvider
+com.sun.media.sound.DirectAudioDeviceProvider
+com.sun.media.sound.HeadspaceMixerProvider
diff -r 3d692e2fa547 -r be4b083df505 overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/windows-ia64/javax.sound.sampled.spi.MixerProvider	Fri Nov 14 04:29:37 2008 +0000
@@ -0,0 +1,6 @@
+# service provider file for Windows IA64: with DirectAudioDeviceProvider
+# last mixer is default mixer
+com.sun.media.sound.PortMixerProvider
+com.sun.media.sound.SimpleInputDeviceProvider
+com.sun.media.sound.DirectAudioDeviceProvider
+com.sun.media.sound.HeadspaceMixerProvider


From gnu_andrew at member.fsf.org  Mon Nov 17 04:41:26 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 12:41:26 +0000
Subject: changeset in /hg/icedtea: Fix some tests and exclude broken ones.
Message-ID: <hg.4e8f60cd59d0.1226925686.-6899778133799504387@icedtea.classpath.org>

changeset 4e8f60cd59d0 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=4e8f60cd59d0
description:
	Fix some tests and exclude broken ones.

	2008-11-14  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Expand generated and pulseaudio.  Lock
		patches to $(top_srcdir).  Run jtreg with
		exclusion lists. General cleanup.
		* fsg.sh: Remove more files related to proprietary plugs.
		* overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java:
		Added, required by some Gervill tests.
		* patches/icedtea-tests-jdk.patch:
		Fix compilation of some tests.
		* test/jtreg/excludelist.jdk.jtx,
		* test/jtreg/excludelist.langtools.jtx:
		Exclude broken tests.

diffstat:

7 files changed, 1842 insertions(+), 21 deletions(-)
ChangeLog                                                                              |   15 
Makefile.am                                                                            | 1282 +++++++++-
fsg.sh                                                                                 |    3 
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java |  207 +
patches/icedtea-tests-jdk.patch                                                        |  111 
test/jtreg/excludelist.jdk.jtx                                                         |  216 +
test/jtreg/excludelist.langtools.jtx                                                   |   29 

diffs (truncated from 1952 to 500 lines):

diff -r be4b083df505 -r 4e8f60cd59d0 ChangeLog
--- a/ChangeLog	Fri Nov 14 04:29:37 2008 +0000
+++ b/ChangeLog	Mon Nov 17 12:41:07 2008 +0000
@@ -1,3 +1,18 @@ 2008-11-14  Andrew John Hughes  <ahughes
+2008-11-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Expand generated and pulseaudio.  Lock
+	patches to $(top_srcdir).  Run jtreg with
+	exclusion lists. General cleanup.
+	* fsg.sh: Remove more files related to proprietary plugs.
+	* overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java:
+	Added, required by some Gervill tests.
+	* patches/icedtea-tests-jdk.patch:
+	Fix compilation of some tests.
+	* test/jtreg/excludelist.jdk.jtx,
+	* test/jtreg/excludelist.langtools.jtx:
+	Exclude broken tests.
+
 2008-11-14  Andrew John Hughes  <ahughes at redhat.com>
 
 	* overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/services/javax.sound.midi.spi.MidiDeviceProvider,
diff -r be4b083df505 -r 4e8f60cd59d0 Makefile.am
--- a/Makefile.am	Fri Nov 14 04:29:37 2008 +0000
+++ b/Makefile.am	Mon Nov 17 12:41:07 2008 +0000
@@ -89,14 +89,1268 @@ install:
 	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
 	clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
 
-EXTRA_DIST = generated $(abs_top_srcdir)/patches/icedtea-*.patch \
+GENERATED_FILES = generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_CN.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_ko.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_es.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_sv.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_fr.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_TW.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_zh_HK.java \
+	generated/com/sun/java/swing/plaf/gtk/resources/gtk_ja.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_es.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_sv.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_fr.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_zh_CN.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_ja.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_it.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_de.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_zh_TW.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_ko.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif_zh_HK.java \
+	generated/com/sun/java/swing/plaf/motif/resources/motif.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_it.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_de.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_zh_CN.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_ko.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_es.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_sv.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_fr.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_zh_TW.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_zh_HK.java \
+	generated/com/sun/java/swing/plaf/windows/resources/windows_ja.java \
+	generated/com/sun/corba/se/spi/activation/ORBPortInfoHelper.java \
+	generated/com/sun/corba/se/spi/activation/Server.java \
+	generated/com/sun/corba/se/spi/activation/ServerIdHelper.java \
+	generated/com/sun/corba/se/spi/activation/BadServerDefinition.java \
+	generated/com/sun/corba/se/spi/activation/EndpointInfoListHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerIdsHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerNotRegisteredHelper.java \
+	generated/com/sun/corba/se/spi/activation/_ServerStub.java \
+	generated/com/sun/corba/se/spi/activation/ServerManagerHolder.java \
+	generated/com/sun/corba/se/spi/activation/ActivatorOperations.java \
+	generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHelper.java \
+	generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORBHolder.java \
+	generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocation.java \
+	generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationPerORB.java \
+	generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHelper.java \
+	generated/com/sun/corba/se/spi/activation/LocatorPackage/ServerLocationHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyActiveHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerHelper.java \
+	generated/com/sun/corba/se/spi/activation/TCPPortHelper.java \
+	generated/com/sun/corba/se/spi/activation/NoSuchEndPoint.java \
+	generated/com/sun/corba/se/spi/activation/EndPointInfo.java \
+	generated/com/sun/corba/se/spi/activation/_ServerManagerImplBase.java \
+	generated/com/sun/corba/se/spi/activation/Repository.java \
+	generated/com/sun/corba/se/spi/activation/BadServerDefinitionHolder.java \
+	generated/com/sun/corba/se/spi/activation/ORBidListHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHelper.java \
+	generated/com/sun/corba/se/spi/activation/NoSuchEndPointHelper.java \
+	generated/com/sun/corba/se/spi/activation/ORBPortInfoHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerHeldDownHelper.java \
+	generated/com/sun/corba/se/spi/activation/EndpointInfoListHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerNotRegisteredHolder.java \
+	generated/com/sun/corba/se/spi/activation/ORBPortInfoListHelper.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryOperations.java \
+	generated/com/sun/corba/se/spi/activation/ServerNotActiveHelper.java \
+	generated/com/sun/corba/se/spi/activation/_LocatorStub.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyActiveHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerHolder.java \
+	generated/com/sun/corba/se/spi/activation/_ServerImplBase.java \
+	generated/com/sun/corba/se/spi/activation/_InitialNameServiceStub.java \
+	generated/com/sun/corba/se/spi/activation/ActivatorHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHelper.java \
+	generated/com/sun/corba/se/spi/activation/EndPointInfoHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerNotActive.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHelper.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBoundHolder.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameServicePackage/NameAlreadyBound.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalledHolder.java \
+	generated/com/sun/corba/se/spi/activation/NoSuchEndPointHolder.java \
+	generated/com/sun/corba/se/spi/activation/_InitialNameServiceImplBase.java \
+	generated/com/sun/corba/se/spi/activation/LocatorOperations.java \
+	generated/com/sun/corba/se/spi/activation/_ActivatorStub.java \
+	generated/com/sun/corba/se/spi/activation/ServerHeldDownHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyActive.java \
+	generated/com/sun/corba/se/spi/activation/IIOP_CLEAR_TEXT.java \
+	generated/com/sun/corba/se/spi/activation/ORBPortInfoListHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerManagerOperations.java \
+	generated/com/sun/corba/se/spi/activation/ServerNotActiveHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyRegistered.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHelper.java \
+	generated/com/sun/corba/se/spi/activation/_ServerManagerStub.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHelper.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryPackage/StringSeqHolder.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDef.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHelper.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryPackage/ServerDefHolder.java \
+	generated/com/sun/corba/se/spi/activation/ActivatorHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalled.java \
+	generated/com/sun/corba/se/spi/activation/InvalidORBidHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyRegisteredHolder.java \
+	generated/com/sun/corba/se/spi/activation/EndPointInfoHolder.java \
+	generated/com/sun/corba/se/spi/activation/Activator.java \
+	generated/com/sun/corba/se/spi/activation/ServerManager.java \
+	generated/com/sun/corba/se/spi/activation/ORBidHelper.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameServiceHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerOperations.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryHelper.java \
+	generated/com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHelper.java \
+	generated/com/sun/corba/se/spi/activation/LocatorHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyUninstalledHolder.java \
+	generated/com/sun/corba/se/spi/activation/POANameHelper.java \
+	generated/com/sun/corba/se/spi/activation/_RepositoryImplBase.java \
+	generated/com/sun/corba/se/spi/activation/ServerIdsHelper.java \
+	generated/com/sun/corba/se/spi/activation/_ActivatorImplBase.java \
+	generated/com/sun/corba/se/spi/activation/InvalidORBidHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerManagerHelper.java \
+	generated/com/sun/corba/se/spi/activation/ServerHeldDown.java \
+	generated/com/sun/corba/se/spi/activation/ORBPortInfo.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameServiceHolder.java \
+	generated/com/sun/corba/se/spi/activation/InvalidORBid.java \
+	generated/com/sun/corba/se/spi/activation/ServerAlreadyInstalled.java \
+	generated/com/sun/corba/se/spi/activation/_LocatorImplBase.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameService.java \
+	generated/com/sun/corba/se/spi/activation/ORBAlreadyRegistered.java \
+	generated/com/sun/corba/se/spi/activation/RepositoryHolder.java \
+	generated/com/sun/corba/se/spi/activation/ORBAlreadyRegisteredHolder.java \
+	generated/com/sun/corba/se/spi/activation/LocatorHolder.java \
+	generated/com/sun/corba/se/spi/activation/Locator.java \
+	generated/com/sun/corba/se/spi/activation/InitialNameServiceOperations.java \
+	generated/com/sun/corba/se/spi/activation/_RepositoryStub.java \
+	generated/com/sun/corba/se/spi/activation/BadServerDefinitionHelper.java \
+	generated/com/sun/corba/se/spi/activation/ORBidListHelper.java \
+	generated/com/sun/corba/se/spi/activation/POANameHolder.java \
+	generated/com/sun/corba/se/spi/activation/ServerNotRegistered.java \
+	generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.resource \
+	generated/com/sun/corba/se/impl/logging/ActivationSystemException.java \
+	generated/com/sun/corba/se/impl/logging/LogStrings.properties \
+	generated/com/sun/corba/se/impl/logging/IORSystemException.resource \
+	generated/com/sun/corba/se/impl/logging/UtilSystemException.resource \
+	generated/com/sun/corba/se/impl/logging/NamingSystemException.resource \
+	generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.java \
+	generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java \
+	generated/com/sun/corba/se/impl/logging/ActivationSystemException.resource \
+	generated/com/sun/corba/se/impl/logging/POASystemException.java \
+	generated/com/sun/corba/se/impl/logging/IORSystemException.java \
+	generated/com/sun/corba/se/impl/logging/POASystemException.resource \
+	generated/com/sun/corba/se/impl/logging/OMGSystemException.java \
+	generated/com/sun/corba/se/impl/logging/ORBUtilSystemException.resource \
+	generated/com/sun/corba/se/impl/logging/NamingSystemException.java \
+	generated/com/sun/corba/se/impl/logging/UtilSystemException.java \
+	generated/com/sun/corba/se/impl/logging/OMGSystemException.resource \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBProxyHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/BadServerDefinition.java \
+	generated/com/sun/corba/se/PortableActivationIDL/EndpointInfoListHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerIdsHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerManagerHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ActivatorOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerTypeHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORBHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerType.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorPackage/ServerLocationPerORB.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/TCPPortHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerProxyOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/NoSuchEndPoint.java \
+	generated/com/sun/corba/se/PortableActivationIDL/EndPointInfo.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ServerManagerImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerProxyHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/Repository.java \
+	generated/com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBidListHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBProxyHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerHeldDownHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ORBProxyStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/EndpointInfoListHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerNotRegisteredHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerNotActiveHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_LocatorStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyActiveHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ServerProxyStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_InitialNameServiceStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ActivatorHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/EndPointInfoHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerNotActive.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerProxyHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBoundHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameServicePackage/NameAlreadyBound.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalledHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/NoSuchEndPointHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_InitialNameServiceImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ActivatorStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerHeldDownHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyActive.java \
+	generated/com/sun/corba/se/PortableActivationIDL/IIOP_CLEAR_TEXT.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfoListHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerManagerOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerNotActiveHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegistered.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ServerManagerStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ORBProxyImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDef.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/ServerDefHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryPackage/AppNamesHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ActivatorHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalled.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InvalidORBidHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyRegisteredHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/EndPointInfoHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/Activator.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerManager.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameServiceHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBProxy.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBProxyOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyUninstalledHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ServerProxyImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_RepositoryImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerIdsHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_ActivatorImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InvalidORBidHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerManagerHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerHeldDown.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBPortInfo.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameServiceHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InvalidORBid.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerAlreadyInstalled.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_LocatorImplBase.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameService.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegistered.java \
+	generated/com/sun/corba/se/PortableActivationIDL/RepositoryHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBAlreadyRegisteredHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/LocatorHolder.java \
+	generated/com/sun/corba/se/PortableActivationIDL/Locator.java \
+	generated/com/sun/corba/se/PortableActivationIDL/InitialNameServiceOperations.java \
+	generated/com/sun/corba/se/PortableActivationIDL/_RepositoryStub.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerProxy.java \
+	generated/com/sun/corba/se/PortableActivationIDL/BadServerDefinitionHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ORBidListHelper.java \
+	generated/com/sun/corba/se/PortableActivationIDL/ServerNotRegistered.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_ko.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_TW.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_es.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_HK.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_sv.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_fr.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_zh_CN.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_ja.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_it.java \
+	generated/com/sun/swing/internal/plaf/basic/resources/basic_de.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_ko.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_CN.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_es.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_sv.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_fr.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_ja.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_TW.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_it.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_zh_HK.java \
+	generated/com/sun/swing/internal/plaf/metal/resources/metal_de.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_ja.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_it.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_de.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_ko.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_es.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_zh_HK.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_sv.java \
+	generated/com/sun/swing/internal/plaf/synth/resources/synth_fr.java \
+	generated/com/sun/tools/apt/resources/apt_zh_CN.java \
+	generated/com/sun/tools/apt/resources/apt.java \
+	generated/com/sun/tools/apt/resources/apt_ja.java \
+	generated/com/sun/tools/jdi/JDWP.java \
+	generated/com/sun/tools/jdi/resources/jdi_zh_CN.java \
+	generated/com/sun/tools/jdi/resources/jdi.java \
+	generated/com/sun/tools/jdi/resources/jdi_ja.java \
+	generated/com/sun/tools/javac/resources/version.java \
+	generated/com/sun/tools/javac/resources/legacy.java \
+	generated/com/sun/tools/javac/resources/javac.java \
+	generated/com/sun/tools/javac/resources/compiler_ja.java \
+	generated/com/sun/tools/javac/resources/compiler_zh_CN.java \
+	generated/com/sun/tools/javac/resources/javac_zh_CN.java \
+	generated/com/sun/tools/javac/resources/compiler.java \
+	generated/com/sun/tools/javac/resources/javac_ja.java \
+	generated/com/sun/tools/doclets/formats/html/resources/standard.java \
+	generated/com/sun/tools/doclets/formats/html/resources/standard_ja.java \
+	generated/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.java \
+	generated/com/sun/tools/doclets/internal/toolkit/resources/doclets.java \
+	generated/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.java \
+	generated/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.java \
+	generated/com/sun/tools/javadoc/resources/javadoc_ja.java \
+	generated/com/sun/tools/javadoc/resources/javadoc_zh_CN.java \
+	generated/com/sun/tools/javadoc/resources/javadoc.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_zh_HK.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_zh_CN.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_ja.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_it.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_de.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_ko.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_en.java \
+	generated/com/sun/accessibility/internal/resources/accessibility.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_es.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_zh_TW.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_sv.java \
+	generated/com/sun/accessibility/internal/resources/accessibility_fr.java \
+	generated/org/omg/IOP/TaggedComponent.java \
+	generated/org/omg/IOP/Codec.java \
+	generated/org/omg/IOP/IORHelper.java \
+	generated/org/omg/IOP/MultipleComponentProfileHolder.java \
+	generated/org/omg/IOP/CodeSets.java \
+	generated/org/omg/IOP/CodecFactory.java \
+	generated/org/omg/IOP/TaggedProfileHelper.java \
+	generated/org/omg/IOP/TAG_RMI_CUSTOM_MAX_STREAM_FORMAT.java \
+	generated/org/omg/IOP/ServiceContextHelper.java \
+	generated/org/omg/IOP/CodecFactoryHelper.java \
+	generated/org/omg/IOP/CodecOperations.java \
+	generated/org/omg/IOP/IORHolder.java \
+	generated/org/omg/IOP/Encoding.java \
+	generated/org/omg/IOP/ServiceContext.java \
+	generated/org/omg/IOP/TAG_MULTIPLE_COMPONENTS.java \
+	generated/org/omg/IOP/TAG_CODE_SETS.java \
+	generated/org/omg/IOP/TaggedProfileHolder.java \
+	generated/org/omg/IOP/ServiceIdHelper.java \
+	generated/org/omg/IOP/ServiceContextHolder.java \
+	generated/org/omg/IOP/TransactionService.java \
+	generated/org/omg/IOP/CodecPackage/InvalidTypeForEncoding.java \
+	generated/org/omg/IOP/CodecPackage/FormatMismatch.java \
+	generated/org/omg/IOP/CodecPackage/FormatMismatchHelper.java \
+	generated/org/omg/IOP/CodecPackage/InvalidTypeForEncodingHelper.java \
+	generated/org/omg/IOP/CodecPackage/TypeMismatchHelper.java \
+	generated/org/omg/IOP/CodecPackage/TypeMismatch.java \
+	generated/org/omg/IOP/TAG_INTERNET_IOP.java \
+	generated/org/omg/IOP/TAG_ORB_TYPE.java \
+	generated/org/omg/IOP/TaggedComponentHelper.java \
+	generated/org/omg/IOP/TAG_JAVA_CODEBASE.java \
+	generated/org/omg/IOP/ProfileIdHelper.java \
+	generated/org/omg/IOP/IOR.java \
+	generated/org/omg/IOP/ServiceContextListHelper.java \
+	generated/org/omg/IOP/RMICustomMaxStreamFormat.java \
+	generated/org/omg/IOP/CodecFactoryPackage/UnknownEncoding.java \
+	generated/org/omg/IOP/CodecFactoryPackage/UnknownEncodingHelper.java \
+	generated/org/omg/IOP/TaggedComponentHolder.java \
+	generated/org/omg/IOP/MultipleComponentProfileHelper.java \
+	generated/org/omg/IOP/ENCODING_CDR_ENCAPS.java \
+	generated/org/omg/IOP/TaggedProfile.java \
+	generated/org/omg/IOP/TAG_ALTERNATE_IIOP_ADDRESS.java \
+	generated/org/omg/IOP/TAG_POLICIES.java \
+	generated/org/omg/IOP/ServiceContextListHolder.java \
+	generated/org/omg/IOP/ExceptionDetailMessage.java \
+	generated/org/omg/IOP/ComponentIdHelper.java \
+	generated/org/omg/IOP/CodecFactoryOperations.java \
+	generated/org/omg/CORBA/WStringSeqHelper.java \
+	generated/org/omg/CORBA/StringSeqHelper.java \
+	generated/org/omg/CORBA/WStringSeqHolder.java \
+	generated/org/omg/CORBA/StringSeqHolder.java \
+	generated/org/omg/CORBA/PolicyErrorHelper.java \
+	generated/org/omg/CORBA/ParameterModeHelper.java \
+	generated/org/omg/CORBA/ParameterMode.java \
+	generated/org/omg/CORBA/PolicyErrorHolder.java \
+	generated/org/omg/CORBA/ParameterModeHolder.java \
+	generated/org/omg/CORBA/PolicyErrorCodeHelper.java \
+	generated/org/omg/PortableInterceptor/ServerIdHelper.java \
+	generated/org/omg/PortableInterceptor/IORInterceptor_3_0Operations.java \
+	generated/org/omg/PortableInterceptor/PolicyFactoryOperations.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceFactory.java \
+	generated/org/omg/PortableInterceptor/ACTIVE.java \
+	generated/org/omg/PortableInterceptor/CurrentHelper.java \
+	generated/org/omg/PortableInterceptor/IORInfo.java \
+	generated/org/omg/PortableInterceptor/ServerRequestInterceptorOperations.java \
+	generated/org/omg/PortableInterceptor/AdapterStateHelper.java \
+	generated/org/omg/PortableInterceptor/ClientRequestInfoOperations.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateNameHelper.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidNameHelper.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfoPackage/DuplicateName.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfoPackage/ObjectIdHelper.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfoPackage/InvalidName.java \
+	generated/org/omg/PortableInterceptor/RequestInfo.java \
+	generated/org/omg/PortableInterceptor/ForwardRequest.java \
+	generated/org/omg/PortableInterceptor/IORInfoOperations.java \
+	generated/org/omg/PortableInterceptor/PolicyFactory.java \
+	generated/org/omg/PortableInterceptor/ServerRequestInterceptor.java \
+	generated/org/omg/PortableInterceptor/CurrentOperations.java \
+	generated/org/omg/PortableInterceptor/IORInterceptor.java \
+	generated/org/omg/PortableInterceptor/IORInterceptorOperations.java \
+	generated/org/omg/PortableInterceptor/HOLDING.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceFactoryHelper.java \
+	generated/org/omg/PortableInterceptor/ServerRequestInfoOperations.java \
+	generated/org/omg/PortableInterceptor/DISCARDING.java \
+	generated/org/omg/PortableInterceptor/ForwardRequestHelper.java \
+	generated/org/omg/PortableInterceptor/ORBInitializerOperations.java \
+	generated/org/omg/PortableInterceptor/USER_EXCEPTION.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHelper.java \
+	generated/org/omg/PortableInterceptor/SUCCESSFUL.java \
+	generated/org/omg/PortableInterceptor/ORBInitializer.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfoOperations.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceTemplateHelper.java \
+	generated/org/omg/PortableInterceptor/ClientRequestInterceptor.java \
+	generated/org/omg/PortableInterceptor/INACTIVE.java \
+	generated/org/omg/PortableInterceptor/ClientRequestInterceptorOperations.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceFactoryHolder.java \
+	generated/org/omg/PortableInterceptor/ServerRequestInfo.java \
+	generated/org/omg/PortableInterceptor/AdapterNameHelper.java \
+	generated/org/omg/PortableInterceptor/SYSTEM_EXCEPTION.java \
+	generated/org/omg/PortableInterceptor/LOCATION_FORWARD.java \
+	generated/org/omg/PortableInterceptor/IORInterceptor_3_0Helper.java \
+	generated/org/omg/PortableInterceptor/AdapterManagerIdHelper.java \
+	generated/org/omg/PortableInterceptor/Current.java \
+	generated/org/omg/PortableInterceptor/ORBInitInfo.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceTemplateSeqHolder.java \
+	generated/org/omg/PortableInterceptor/ClientRequestInfo.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceTemplateHolder.java \
+	generated/org/omg/PortableInterceptor/ObjectIdHelper.java \
+	generated/org/omg/PortableInterceptor/NON_EXISTENT.java \
+	generated/org/omg/PortableInterceptor/Interceptor.java \
+	generated/org/omg/PortableInterceptor/InvalidSlot.java \
+	generated/org/omg/PortableInterceptor/IORInterceptor_3_0.java \
+	generated/org/omg/PortableInterceptor/IORInterceptor_3_0Holder.java \
+	generated/org/omg/PortableInterceptor/RequestInfoOperations.java \
+	generated/org/omg/PortableInterceptor/UNKNOWN.java \
+	generated/org/omg/PortableInterceptor/InterceptorOperations.java \
+	generated/org/omg/PortableInterceptor/ORBIdHelper.java \
+	generated/org/omg/PortableInterceptor/InvalidSlotHelper.java \
+	generated/org/omg/PortableInterceptor/ObjectReferenceTemplate.java \
+	generated/org/omg/PortableInterceptor/TRANSPORT_RETRY.java \
+	generated/org/omg/CosNaming/BindingListHelper.java \
+	generated/org/omg/CosNaming/BindingTypeHolder.java \
+	generated/org/omg/CosNaming/NameHolder.java \
+	generated/org/omg/CosNaming/NamingContextExt.java \
+	generated/org/omg/CosNaming/NamingContextPOA.java \
+	generated/org/omg/CosNaming/BindingType.java \
+	generated/org/omg/CosNaming/NamingContextExtHelper.java \
+	generated/org/omg/CosNaming/_BindingIteratorStub.java \
+	generated/org/omg/CosNaming/BindingIterator.java \
+	generated/org/omg/CosNaming/BindingListHolder.java \
+	generated/org/omg/CosNaming/_NamingContextStub.java \
+	generated/org/omg/CosNaming/NamingContextExtHolder.java \
+	generated/org/omg/CosNaming/IstringHelper.java \
+	generated/org/omg/CosNaming/NameComponentHelper.java \
+	generated/org/omg/CosNaming/BindingIteratorPOA.java \
+	generated/org/omg/CosNaming/NamingContext.java \
+	generated/org/omg/CosNaming/_NamingContextExtStub.java \
+	generated/org/omg/CosNaming/NamingContextExtOperations.java \
+	generated/org/omg/CosNaming/BindingHelper.java \
+	generated/org/omg/CosNaming/BindingIteratorHelper.java \
+	generated/org/omg/CosNaming/NamingContextHelper.java \
+	generated/org/omg/CosNaming/NamingContextExtPOA.java \
+	generated/org/omg/CosNaming/NameComponentHolder.java \
+	generated/org/omg/CosNaming/BindingIteratorOperations.java \


From gnu_andrew at member.fsf.org  Mon Nov 17 06:25:03 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 14:25:03 +0000
Subject: changeset in /hg/icedtea6: 2008-11-03 Nix <nix@esperi.org.uk>
In-Reply-To: <hg.835cdb193847.1225750514.2873452341184383832@icedtea.classpath.org>
References: <hg.835cdb193847.1225750514.2873452341184383832@icedtea.classpath.org>
Message-ID: <17c6771e0811170625q3ae92eb5lafe4f32cf33cd5cf@mail.gmail.com>

2008/11/3 Omair Majid <omajid at redhat.com>:
> changeset 835cdb193847 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=835cdb193847
> description:
>        2008-11-03 Nix  <nix at esperi.org.uk>
>                   Omair Majid  <omajid at redhat.com>
>
>            * Makefile.am (ICEDTEA_PATCHES): Added icedtea-linker-libs-order.patch.
>            * patches/icedtea-linker-libs-order.patch: Fixes icedtea bug#237.
>
> diffstat:
>
> 3 files changed, 74 insertions(+), 1 deletion(-)
> ChangeLog                               |    6 ++
> Makefile.am                             |    3 -
> patches/icedtea-linker-libs-order.patch |   66 +++++++++++++++++++++++++++++++
>
> diffs (96 lines):
>
> diff -r 3120ce63433d -r 835cdb193847 ChangeLog
> --- a/ChangeLog Mon Nov 03 16:55:57 2008 -0500
> +++ b/ChangeLog Mon Nov 03 17:14:22 2008 -0500
> @@ -1,3 +1,9 @@ 2008-11-03  Omair Majid  <omajid at redhat.
> +2008-11-03 Nix  <nix at esperi.org.uk>
> +                  Omair Majid  <omajid at redhat.com>
> +
> +       * Makefile.am (ICEDTEA_PATCHES): Added icedtea-linker-libs-order.patch.
> +       * patches/icedtea-linker-libs-order.patch: Fixes icedtea bug#237.
> +
>  2008-11-03  Omair Majid  <omajid at redhat.com>
>
>        * patches/icedtea-alsa-default-device.patch: New patch. Use the ALSA
> diff -r 3120ce63433d -r 835cdb193847 Makefile.am
> --- a/Makefile.am       Mon Nov 03 16:55:57 2008 -0500
> +++ b/Makefile.am       Mon Nov 03 17:14:22 2008 -0500
> @@ -533,7 +533,8 @@ ICEDTEA_PATCHES = \
>        patches/icedtea-javac-debuginfo.patch \
>        patches/icedtea-xjc.patch \
>        patches/icedtea-renderer-crossing.patch \
> -       patches/icedtea-alsa-default-device.patch
> +       patches/icedtea-alsa-default-device.patch \
> +       patches/icedtea-linker-libs-order.patch
>
>  if WITH_RHINO
>  ICEDTEA_PATCHES += \
> diff -r 3120ce63433d -r 835cdb193847 patches/icedtea-linker-libs-order.patch
> --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/icedtea-linker-libs-order.patch   Mon Nov 03 17:14:22 2008 -0500
> @@ -0,0 +1,66 @@
> +diff -durN openjdk-orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk
> +--- openjdk-orig/jdk/make/common/shared/Sanity.gmk     2008-10-27 00:25:33.000000000 +0000
> ++++ openjdk/jdk/make/common/shared/Sanity.gmk  2008-10-28 21:42:16.000000000 +0000
> +@@ -1397,7 +1397,7 @@
> + ifdef ALSA_VERSION_CHECK
> + $(ALSA_VERSION_CHECK): $(ALSA_VERSION_CHECK).c
> +       @$(prep-target)
> +-      @$(CC) -lasound -o $@ $<
> ++      @$(CC) -o $@ $< -lasound
> +
> + $(ALSA_VERSION_CHECK).c:
> +       @$(prep-target)
> +diff -durN openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile
> +--- openjdk-orig/jdk/make/javax/sound/jsoundalsa/Makefile      2008-08-28 09:10:50.000000000 +0100
> ++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile   2008-10-28 21:55:27.000000000 +0000
> +@@ -65,7 +65,7 @@
> +       $(MIDIFILES_export) \
> +       $(PORTFILES_export)
> +
> +-LDFLAGS += -lasound
> ++OTHER_LDLIBS += -lasound
> +
> + CPPFLAGS += \
> +       -DUSE_DAUDIO=TRUE \
> +diff -durN openjdk-orig/jdk/make/com/sun/java/pack/Makefile openjdk/jdk/make/com/sun/java/pack/Makefile
> +--- openjdk-orig/jdk/make/com/sun/java/pack/Makefile   2008-10-27 00:25:30.000000000 +0000
> ++++ openjdk/jdk/make/com/sun/java/pack/Makefile        2008-10-28 23:27:55.000000000 +0000
> +@@ -75,12 +75,12 @@
> +             $(ZIPOBJDIR)/infutil.$(OBJECT_SUFFIX) \
> +             $(ZIPOBJDIR)/inffast.$(OBJECT_SUFFIX)
> +
> +-  OTHER_LDLIBS += -lz
> + else
> +   OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
> +-  OTHER_LDLIBS += -lz $(JVMLIB)
> ++  OTHER_LDLIBS += $(JVMLIB)
> + endif
> +
> ++OTHER_LDLIBS += -lz
> + CXXFLAGS_DBG += -DFULL
> + CXXFLAGS_OPT += -DPRODUCT
> + CXXFLAGS_COMMON += -DFULL
> +@@ -100,12 +100,11 @@
> +   COMPILER_WARNINGS_FATAL=false
> + else
> +   LDOUTPUT = -o #Have a space
> +-  LDDFLAGS += -lz -lc
> +-  OTHER_LDLIBS  += $(LIBCXX)
> ++  OTHER_LDLIBS += $(LIBCXX) -lc
> + # setup the list of libraries to link in...
> + ifeq ($(PLATFORM), linux)
> + ifeq ("$(CC_VER_MAJOR)", "3")
> +-  OTHER_LDLIBS  += -lz -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
> ++  OTHER_LDLIBS  += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
> + endif
> + endif #LINUX
> + endif #PLATFORM
> +@@ -142,7 +141,7 @@
> +
> + $(UNPACK_EXE): $(UNPACK_EXE_FILES_o) winres
> +       $(prep-target)
> +-      $(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
> ++      $(LINKER)  $(LDDFLAGS) $(UNPACK_EXE_FILES_o) $(RES) $(OTHER_LDLIBS) $(LIBCXX) $(LDOUTPUT)$(TEMPDIR)/unpack200$(EXE_SUFFIX)
> +       $(CP) $(TEMPDIR)/unpack200$(EXE_SUFFIX) $(UNPACK_EXE)
> +
> +
>

Hi Omair,

Thanks for the patch.  Can you please make sure to document new
icedtea/* patches in HACKING?
It makes them easier to understand when porting to the 7 tree.

Thanks,
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 17 06:45:25 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 17 Nov 2008 14:45:25 +0000
Subject: [Bug 257] Can't run Juniper Networks Network Connect
Message-ID: <E1L25Lx-0005j2-7j@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=257


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From omajid at redhat.com  Mon Nov 17 06:53:54 2008
From: omajid at redhat.com (Omair Majid)
Date: Mon, 17 Nov 2008 14:53:54 +0000
Subject: changeset in /hg/icedtea6: 2008-11-17  Omair Majid  <omajid@redh...
Message-ID: <hg.ccf50a917765.1226933634.2873452341184383832@icedtea.classpath.org>

changeset ccf50a917765 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ccf50a917765
description:
	2008-11-17  Omair Majid  <omajid at redhat.com>

	    * HACKING: Document icedtea-alsa-default-device.patch and
	    icedtea-linker-libs-order.patch.

diffstat:

2 files changed, 7 insertions(+)
ChangeLog |    5 +++++
HACKING   |    2 ++

diffs (24 lines):

diff -r 3d0cabbaa2b3 -r ccf50a917765 ChangeLog
--- a/ChangeLog	Mon Nov 17 09:29:48 2008 +0100
+++ b/ChangeLog	Mon Nov 17 09:53:50 2008 -0500
@@ -1,3 +1,8 @@ 2008-11-17  Matthias Klose  <doko at ubuntu
+2008-11-17  Omair Majid  <omajid at redhat.com>
+
+	* HACKING: Document icedtea-alsa-default-device.patch and
+	icedtea-linker-libs-order.patch.
+
 2008-11-17  Matthias Klose  <doko at ubuntu.com>
 
 	* fsg.sh: Don't remove xml-stylesheet files.
diff -r 3d0cabbaa2b3 -r ccf50a917765 HACKING
--- a/HACKING	Mon Nov 17 09:29:48 2008 +0100
+++ b/HACKING	Mon Nov 17 09:53:50 2008 -0500
@@ -63,6 +63,8 @@ The following patches are currently appl
 * icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
 * icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
+* icedtea-alsa-default-device.patch: Fix problems with using the ALSA 'default' device.
+* icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
 * icedtea-cc-interp-no-fer.patch: Report that we cannot force early returns with the C++ interpreter.
 * icedtea-6761856-freetypescaler.patch: Fix IcedTea bug #227, OpenJDK bug


From gnu_andrew at member.fsf.org  Mon Nov 17 07:56:04 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 15:56:04 +0000
Subject: IcedTea6 merged
Message-ID: <17c6771e0811170756u2b793203i663becc09bb93e29@mail.gmail.com>

Just completed another merge of IcedTea6 to IcedTea7

remote: added 52 changesets with 180 changes to 80 files

A busy two weeks or so since 1.3.1 was released :)

Local changes are just a recreation of Omair's linker patch (applied
with fuzz) and a readaptation of mjw's testenv patch to work with the
equivalent, TestUtil, in OpenJDK7.

2008-11-17  Andrew John Hughes  <ahughes at redhat.com>

        Merge with IcedTea6.
        * .hgignore,
        * .hgtags,
        * ChangeLog,
        * HACKING,
        * IcedTeaPlugin.cc,
        * Makefile.am,
        * contrib/mixtec-hacks.patch,
        * fsg.sh,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java,
        * overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java,
        * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPClassLoader.java,
        * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java,
        * overlays/openjdk/jdk/src/share/classes/net/sourceforge/jnlp/security/AccessWarningPane.java,
        * patches/icedtea-6761856-freetypescaler.patch,
        * patches/icedtea-alsa-default-device.patch,
        * patches/icedtea-cc-interp-no-fer.patch,
        * patches/icedtea-display-mode-changer.patch,
        * patches/icedtea-f2i-overflow.patch: Merged.
        * patches/icedtea-linker-libs-order.patch: Rebuilt.
        * patches/icedtea-testenv.patch: Converted to work against TestUtil.
        * patches/icedtea-uname.patch,
        * patches/icedtea-visualvm.patch,
        * plugin/icedtea/sun/applet/PluginAppletViewer.java,
        * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.inline.hpp,
        * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp,
        * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp,
        * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp,
        * ports/hotspot/src/cpu/zero/vm/globals_zero.hpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/orderAccess_linux_zero.inline.hpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp,
        * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp,
        * ports/hotspot/src/share/vm/shark/sharkBlock.cpp,
        * ports/hotspot/src/share/vm/shark/sharkBlock.hpp,
        * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp,
        * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Debug.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/EventLoop.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Operation.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioClip.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixer.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioMixerProvider.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioPort.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLine.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioSourcePort.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetDataLine.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/PulseAudioTargetPort.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/SecurityWrapper.java,
        * pulseaudio/src/java/org/classpath/icedtea/pulseaudio/Stream.java,
        * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.c,
        * pulseaudio/unittests/org/classpath/icedtea/pulseaudio/PulseAudioSourceDataLineTest.java,
        * test/jtreg/README,
        * test/jtreg/com/sun/javatest/diff/Diff.java,
        * test/jtreg/com/sun/javatest/diff/Fault.java,
        * test/jtreg/com/sun/javatest/diff/HTMLReporter.java,
        * test/jtreg/com/sun/javatest/diff/HTMLWriter.java,
        * test/jtreg/com/sun/javatest/diff/Main.java,
        * test/jtreg/com/sun/javatest/diff/MultiMap.java,
        * test/jtreg/com/sun/javatest/diff/ReportReader.java,
        * test/jtreg/com/sun/javatest/diff/StandardDiff.java,
        * test/jtreg/com/sun/javatest/diff/SuperDiff.java,
        * test/jtreg/com/sun/javatest/diff/WorkDirectoryReader.java,
        * test/jtreg/com/sun/javatest/diff/i18n.properties,
        * test/jtreg/com/sun/javatest/regtest/Main.java,
        * test/jtreg/com/sun/javatest/regtest/MainAction.java,
        * test/jtreg/com/sun/javatest/regtest/RegressionSecurityManager.java,
        * test/jtreg/com/sun/javatest/regtest/RegressionTestFinder.java,
        * test/jtreg/com/sun/javatest/regtest/i18n.properties: Merged.


-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 17 08:01:24 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 17 Nov 2008 16:01:24 +0000
Subject: [Bug 256] Error loging on to Nordea Homebanking
Message-ID: <E1L26XU-0005qz-Lh@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=256


nikolaj at sheller.dk changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From Dalibor.Topic at Sun.COM  Mon Nov 17 08:25:20 2008
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Mon, 17 Nov 2008 17:25:20 +0100
Subject: Public open specs
In-Reply-To: <17c6771e0811151650g798290b3t7f76f78bb463442b@mail.gmail.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
	<491D858C.70109@sun.com>
	<1226674908.3266.58.camel@dijkstra.wildebeest.org>
	<491DC160.4030004@sun.com>
	<1226739682.16426.29.camel@hermans.wildebeest.org>
	<17c6771e0811151650g798290b3t7f76f78bb463442b@mail.gmail.com>
Message-ID: <49219AF0.6070407@sun.com>

Andrew John Hughes wrote:
>> Getting all these JSRs published freely and openly without click-through
>> like you want to do for the JVM spec would solve all these issues.
>>
>>     
>
> Couldn't agree more.  Why is it the specs for TCP (an RFC) and HTML
> (W3C recommendation) are published openly on the web, yet the JSR
> specifications are hidden behind pages of legalese?  Whether its onus
> or not, it still has to be read and approved and is enough to
> introduce doubt into people's minds.  If we could just load up a web
> page and read them with no click-throughs, life would be much easier.
>   
Thank you both for taking the time to explain your concerns, and
provide me with a toolchest of arguments to pick from.

I'll go work on my poking tools now.


cheers,
dalibor topic


From gnu_andrew at member.fsf.org  Mon Nov 17 12:43:33 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 17 Nov 2008 20:43:33 +0000
Subject: changeset in /hg/icedtea: Remove NIO tests from exclusion list.
Message-ID: <hg.79d3c8c363dc.1226954613.-6899778133799504387@icedtea.classpath.org>

changeset 79d3c8c363dc in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=79d3c8c363dc
description:
	Remove NIO tests from exclusion list.

	2008-11-17  Andrew John Hughes  <ahughes at redhat.com>

		* test/jtreg/excludelist.jdk.jtx:
		Remove NIO tests following mjw's fix.

diffstat:

2 files changed, 7 insertions(+), 24 deletions(-)
ChangeLog                      |    5 +++++
test/jtreg/excludelist.jdk.jtx |   26 ++------------------------

diffs (50 lines):

diff -r 79e96b23cdd3 -r 79d3c8c363dc ChangeLog
--- a/ChangeLog	Mon Nov 17 15:26:51 2008 +0000
+++ b/ChangeLog	Mon Nov 17 20:43:17 2008 +0000
@@ -1,3 +1,8 @@ 2008-11-17  Andrew John Hughes  <ahughes
+2008-11-17  Andrew John Hughes  <ahughes at redhat.com>
+
+	* test/jtreg/excludelist.jdk.jtx:
+	Remove NIO tests following mjw's fix.
+	
 2008-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	Merge with IcedTea6.
diff -r 79e96b23cdd3 -r 79d3c8c363dc test/jtreg/excludelist.jdk.jtx
--- a/test/jtreg/excludelist.jdk.jtx	Mon Nov 17 15:26:51 2008 +0000
+++ b/test/jtreg/excludelist.jdk.jtx	Mon Nov 17 20:43:17 2008 +0000
@@ -16,32 +16,10 @@ sun/java2d/SunGraphics2D/SimplePrimQuali
 sun/java2d/SunGraphics2D/SimplePrimQuality.java
 
 # Failed due to connection refused
-sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java
+#sun/security/ssl/javax/net/ssl/NewAPIs/SessionCacheSizeTests.java
 
 # Failed due to network unreachable
-java/net/ipv6tests/TcpTest.java
-
-# Failed due to unknown host javaweb.sfbay.sun.com
-java/nio/channels/DatagramChannel/IsBound.java
-java/nio/channels/DatagramChannel/IsConnected.java
-java/nio/channels/Selector/Alias.java
-java/nio/channels/Selector/BasicConnect.java
-java/nio/channels/Selector/Connect.java
-java/nio/channels/Selector/ConnectWrite.java
-java/nio/channels/Selector/KeysReady.java
-java/nio/channels/Selector/OpRead.java
-java/nio/channels/SocketChannel/AdaptSocket.java
-java/nio/channels/SocketChannel/Basic.java
-java/nio/channels/SocketChannel/BufferSize.java
-java/nio/channels/SocketChannel/Connect.java
-java/nio/channels/SocketChannel/ConnectState.java
-java/nio/channels/SocketChannel/FinishConnect.java
-java/nio/channels/SocketChannel/IsConnectable.java
-java/nio/channels/SocketChannel/LocalAddress.java
-java/nio/channels/SocketChannel/Shutdown.java
-java/nio/channels/SocketChannel/Stream.java
-java/nio/channels/SocketChannel/VectorParams.java
-java/nio/channels/DatagramChannel/AdaptDatagramSocket.java
+#java/net/ipv6tests/TcpTest.java
 
 # Failed due to java.security.ProviderException: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_DEVICE_ERROR
 sun/security/pkcs11/KeyAgreement/TestDH.java


From dbhole at redhat.com  Tue Nov 18 08:04:51 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Tue, 18 Nov 2008 16:04:51 +0000
Subject: changeset in /hg/icedtea6: - Encode newline characters instead o...
Message-ID: <hg.ff7010bc3cae.1227024291.2873452341184383832@icedtea.classpath.org>

changeset ff7010bc3cae in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ff7010bc3cae
description:
	- Encode newline characters instead of stripping them.
	- Fix bug in code that computed width factor.
	- Try to load images from local cache first.
	- Update parser to skip comments in applet tag.
	- Take into consideration system policy in addition to applet policy when
	  determining permissions.
	- Return from jar verifier function immediately if jar could not be fetched
	  (fixes NPE crash).

diffstat:

7 files changed, 238 insertions(+), 76 deletions(-)
ChangeLog                                                  |   12 
IcedTeaPlugin.cc                                           |   26 +
plugin/icedtea/sun/applet/PluginAppletSecurityContext.java |    2 
plugin/icedtea/sun/applet/PluginAppletViewer.java          |  247 ++++++++----
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java       |    5 
rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java            |   11 
rt/net/sourceforge/jnlp/tools/JarSigner.java               |   11 

diffs (truncated from 542 to 500 lines):

diff -r ccf50a917765 -r ff7010bc3cae ChangeLog
--- a/ChangeLog	Mon Nov 17 09:53:50 2008 -0500
+++ b/ChangeLog	Tue Nov 18 11:04:46 2008 -0500
@@ -1,3 +1,15 @@ 2008-11-17  Omair Majid  <omajid at redhat.
+2008-11-18  Deepak Bhole  <dbhole at redhat.com>
+	* IcedTeaPlugin.cc: Encode newline characters instead of stripping them.
+	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Minor debug
+	output change.
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Fix bug in code that
+	computed width factor. Try to load images from local cache first. Decode
+	newline characters. Update parser to skip comments in applet tag.
+	* rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java: Take into consideration
+	system policy in addition to applet policy when determining permissions.
+	* rt/net/sourceforge/jnlp/tools/JarSigner.java: Return immediately if jar
+	could not be fetched.
+
 2008-11-17  Omair Majid  <omajid at redhat.com>
 
 	* HACKING: Document icedtea-alsa-default-device.patch and
diff -r ccf50a917765 -r ff7010bc3cae IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc	Mon Nov 17 09:53:50 2008 -0500
+++ b/IcedTeaPlugin.cc	Tue Nov 18 11:04:46 2008 -0500
@@ -2310,10 +2310,28 @@ IcedTeaPluginInstance::Initialize (nsIPl
   tagMessage += appletTag;
   tagMessage += "</embed>";
 
-  // remove newline characters from the message
-  tagMessage.StripChars("\r\n");
-
-  factory->SendMessageToAppletViewer (tagMessage);
+  PLUGIN_DEBUG_1ARG("TAG FROM BROWSER = %s\n", tagMessage.get());
+
+  // encode newline characters in the message
+  nsCString toSend("");
+  for (int i=0; i < tagMessage.Length(); i++)
+  {
+	  if (tagMessage.get()[i] == '\r')
+	  {
+		  toSend += "&#13;";
+		  continue;
+	  }
+
+	  if (tagMessage.get()[i] == '\n')
+	  {
+		  toSend += "&#10;";
+		  continue;
+	  }
+
+	  toSend += tagMessage.get()[i];
+  }
+
+  factory->SendMessageToAppletViewer (toSend);
 
   // Set back-pointer to peer instance.
   PLUGIN_DEBUG_1ARG ("SETTING PEER!!!: %p\n", aPeer);
diff -r ccf50a917765 -r ff7010bc3cae plugin/icedtea/sun/applet/PluginAppletSecurityContext.java
--- a/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Mon Nov 17 09:53:50 2008 -0500
+++ b/plugin/icedtea/sun/applet/PluginAppletSecurityContext.java	Tue Nov 18 11:04:46 2008 -0500
@@ -996,7 +996,7 @@ public class PluginAppletSecurityContext
 
 		String classSrc = this.classLoaders.get(target.getClassLoader());
 
-		PluginDebug.debug("jsSrc=" + jsSrc + " classSrc=" + classSrc);
+		PluginDebug.debug("target = " + target + " jsSrc=" + jsSrc + " classSrc=" + classSrc);
 		
 		// if src is not a file and class loader does not map to the same base, UniversalBrowserRead (BrowserReadPermission) must be set
 		if (jsSrc != "file://" && !classSrc.equals(jsSrc)) {
diff -r ccf50a917765 -r ff7010bc3cae plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Mon Nov 17 09:53:50 2008 -0500
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Tue Nov 18 11:04:46 2008 -0500
@@ -63,6 +63,7 @@ import javax.swing.SwingUtilities;
 import javax.swing.SwingUtilities;
 
 import net.sourceforge.jnlp.NetxPanel;
+import net.sourceforge.jnlp.runtime.JNLPClassLoader;
 import sun.awt.AppContext;
 import sun.awt.SunToolkit;
 import sun.awt.X11.XEmbeddedFrame;
@@ -103,7 +104,7 @@ import sun.misc.Ref;
       * Some constants...
       */
      private static String defaultSaveFile = "Applet.ser";
- 
+     
      /**
       * The panel in which the applet is being displayed.
       */
@@ -138,6 +139,8 @@ import sun.misc.Ref;
      
      private double proposedHeightFactor;
      private double proposedWidthFactor;
+     
+     private JNLPClassLoader pluginCL; 
 
      /**
       * Null constructor to allow instantiation via newInstance()
@@ -168,7 +171,7 @@ import sun.misc.Ref;
         	 proposedHeightFactor = (Integer) atts.get("heightPercentage")/100.0;
          }
          
-         if (((String) atts.get("width")).endsWith("%")) {
+         if (atts.get("widthPercentage") != null) {
         	 proposedWidthFactor = (Integer) atts.get("widthPercentage")/100.0;
          }
  
@@ -177,6 +180,7 @@ import sun.misc.Ref;
             	 	try {
             	 		panel = new NetxPanel(doc, atts, true);
             	 		AppletViewerPanel.debug("Using NetX panel");
+            	 		PluginDebug.debug(atts.toString());
             	 	} catch (Exception ex) {
             	 		AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
             	 		panel = new AppletViewerPanel(doc, atts);
@@ -284,6 +288,9 @@ import sun.misc.Ref;
     	return;
     }
 
+    if (panel instanceof NetxPanel)
+        pluginCL = (JNLPClassLoader) panel.getApplet().getClass().getClassLoader();
+
     PluginDebug.debug("Applet initialized");
 
     // Applet initialized. Find out it's classloader and add it to the list
@@ -291,7 +298,7 @@ import sun.misc.Ref;
 
     if (atts.get("codebase") != null) {
     	try {
-    		URL appletSrcURL = new URL((String) atts.get("codebase"));
+    		URL appletSrcURL = new URL(codeBase + (String) atts.get("codebase"));
     		codeBase = appletSrcURL.getProtocol() + "://" + appletSrcURL.getHost();
     	} catch (MalformedURLException mfue) {
     		// do nothing
@@ -587,7 +594,7 @@ import sun.misc.Ref;
  	return getCachedImage(url);
      }
  
-     static Image getCachedImage(URL url) {
+     private Image getCachedImage(URL url) {
  	// System.getSecurityManager().checkConnection(url.getHost(), url.getPort());
  	return (Image)getCachedImageRef(url).get();
      }
@@ -595,15 +602,45 @@ import sun.misc.Ref;
      /**
       * Get an image ref.
       */
-     static Ref getCachedImageRef(URL url) {
- 	synchronized (imageRefs) {
- 	    AppletImageRef ref = (AppletImageRef)imageRefs.get(url);
- 	    if (ref == null) {
- 		ref = new AppletImageRef(url);
- 		imageRefs.put(url, ref);
- 	    }
- 	    return ref;
- 	}
+     private synchronized Ref getCachedImageRef(URL url) {
+         PluginDebug.debug("getCachedImageRef() searching for " + url);
+         
+         try {
+
+             // wait till aplet initializes
+             while (pluginCL == null) {
+                 PluginDebug.debug("Plugin CL is null. Waiting in getCachedImageRef()..");
+             }
+
+             String originalURL = url.toString();
+             String codeBase = pluginCL.getJNLPFile().getCodeBase().toString();
+
+             if (originalURL.startsWith("http")) {
+                 PluginDebug.debug("getCachedImageRef() got URL = " + url);
+                 PluginDebug.debug("getCachedImageRef() plugin codebase = " + pluginCL.getJNLPFile().getCodeBase().toString());
+
+                 URL localURL = null;
+                 if (originalURL.startsWith(codeBase))
+                     localURL = pluginCL.getResource(originalURL.substring(codeBase.length()));
+
+                 url = localURL != null ? localURL : url;
+             }
+
+             PluginDebug.debug("getCachedImageRef() getting img from URL = " + url);
+
+             synchronized (imageRefs) {
+                 AppletImageRef ref = (AppletImageRef)imageRefs.get(url);
+                 if (ref == null) {
+                     ref = new AppletImageRef(url);
+                     imageRefs.put(url, ref);
+                 }
+                 return ref;
+             }
+         } catch (Exception e) {
+             System.err.println("Error occurred wgen trying to fetch image:");
+             e.printStackTrace();
+             return null;
+         }
      }
  
      /**
@@ -1221,6 +1258,16 @@ import sun.misc.Ref;
       */
      public static String scanIdentifier(Reader in) throws IOException {
  	StringBuffer buf = new StringBuffer();
+ 	
+ 	if (c == '!') {
+        // Technically, we should be scanning for '!--' but we are reading 
+        // from a stream, and there is no way to peek ahead. That said, 
+        // a ! at this point can only mean comment here afaik, so we 
+        // should be okay
+        skipComment(in);
+        return "";
+    }
+ 	
  	while (true) {
  	    if (((c >= 'a') && (c <= 'z')) ||
  		((c >= 'A') && (c <= 'Z')) ||
@@ -1231,6 +1278,41 @@ import sun.misc.Ref;
  		return buf.toString();
  	    }
  	}
+     }
+
+     public static void skipComment(Reader in) throws IOException {
+         StringBuffer buf = new StringBuffer();
+         boolean commentHeaderPassed = false;
+         c = in.read();
+         buf.append((char)c);
+
+         while (true) {
+             if (c == '-' && (c = in.read()) == '-') {
+                 buf.append((char)c);
+                 if (commentHeaderPassed) {
+                     // -- encountered ... is > next?
+                     if ((c = in.read()) == '>') {
+                         buf.append((char)c);
+
+                         PluginDebug.debug("Comment skipped: " + buf.toString());
+
+                         // comment skipped.
+                         return;
+                     }
+                 } else {
+                     // first -- is part of <!-- ... , just mark that we have passed it
+                     commentHeaderPassed = true;
+                 }
+
+             } else if (commentHeaderPassed == false) {
+                 buf.append((char)c);
+                 PluginDebug.debug("Warning: Attempted to skip comment, but this tag does not appear to be a comment: " + buf.toString());
+                 return;
+             }
+
+             c = in.read();
+             buf.append((char)c);
+         }
      }
  
      /**
@@ -1266,11 +1348,21 @@ import sun.misc.Ref;
  		val = buf.toString();
  	    }
 
+        att = att.replace("&gt;", ">");
+        att = att.replace("&lt;", "<");
+        att = att.replace("&amp;", "&");
+        att = att.replace("&#10;", "\n");
+        att = att.replace("&#13;", "\r");
+ 	    
         val = val.replace("&gt;", ">");
         val = val.replace("&lt;", "<");
         val = val.replace("&amp;", "&");
- 	    PluginDebug.debug("PUT " + att + " = '" + val + "'");
- 	    atts.put(att.toLowerCase(java.util.Locale.ENGLISH), val);
+        val = val.replace("&#10;", "\n");
+        val = val.replace("&#13;", "\r");
+
+        PluginDebug.debug("PUT " + att + " = '" + val + "'");
+        atts.put(att.toLowerCase(java.util.Locale.ENGLISH), val);
+
              while (true) {
                  if ((c == '>') || (c < 0) ||
                      ((c >= 'a') && (c <= 'z')) ||
@@ -1282,6 +1374,20 @@ import sun.misc.Ref;
              //skipSpace(in);
  	}
  	return atts;
+     }
+     
+     // private static final == inline
+     private static final boolean isInt(Object o) {
+         boolean isInt = false;
+
+         try {
+             Integer.parseInt((String) o);
+             isInt = true;
+         } catch (Exception e) {
+             // don't care
+         }
+
+         return isInt;
      }
  
      /* values used for placement of AppletViewer's frames */
@@ -1426,12 +1532,19 @@ import sun.misc.Ref;
     						 if (val == null) {
     							 statusMsgStream.println(requiresNameWarning);
     						 } else if (atts != null) {
-    							 // to prevent headaches, c++ side encodes &, < and >
-    							 // decode them back
+    							 att = att.replace("&gt;", ">");
+    							 att = att.replace("&lt;", "<");
+    							 att = att.replace("&amp;", "&");
+    							 att = att.replace("&#10;", "\n");
+    							 att = att.replace("&#13;", "\r");
+
     							 val = val.replace("&gt;", ">");
     							 val = val.replace("&lt;", "<");
     							 val = val.replace("&amp;", "&");
-    							 atts.put(att.toLowerCase(), val);
+    							 val = val.replace("&#10;", "\n");
+    							 val = val.replace("&#13;", "\r");
+    							 PluginDebug.debug("PUT " + att + " = " + val);
+   							     atts.put(att.toLowerCase(), val);
     						 } else {
     							 statusMsgStream.println(paramOutsideWarning);
     						 }
@@ -1453,21 +1566,21 @@ import sun.misc.Ref;
     						 atts = null;
     					 }
 
-    					 if (atts.get("width") == null) {
-    						 atts.put("width", "100");
+    					 if (atts.get("width") == null || !isInt(atts.get("width"))) {
+    						 atts.put("width", "1000");
     						 atts.put("widthPercentage", 100);
     					 } else if (((String) atts.get("width")).endsWith("%")) {
     						 String w = (String) atts.get("width");
-    						 atts.put("width", "100");
+    						 atts.put("width", "1000");
     						 atts.put("widthPercentage", Integer.parseInt((w.substring(0,  w.length() -1))));
     					  }
 
-    					 if (atts.get("height") == null) {
-    						 atts.put("height", "100");
+    					 if (atts.get("height") == null || !isInt(atts.get("height"))) {
+    						 atts.put("height", "1000");
     						 atts.put("heightPercentage", 100);
     					 } else if (((String) atts.get("height")).endsWith("%")) {
     						 String h = (String) atts.get("height");
-    						 atts.put("height", "100");
+    						 atts.put("height", "1000");
     						 atts.put("heightPercentage", Integer.parseInt(h.substring(0,  h.length() -1)));
     					 }
     				 }
@@ -1489,8 +1602,42 @@ import sun.misc.Ref;
     						 atts.remove("codebase");
     					 }
 
-    					 if (atts.get("width") == null) {
-    						 atts.put("width", "100");
+    					 if (atts.get("width") == null || !isInt(atts.get("width"))) {
+    						 atts.put("width", "1000");
+    						 atts.put("widthPercentage", 100);
+    					 } else if (((String) atts.get("width")).endsWith("%")) {
+    						 String w = (String) atts.get("width");
+    						 atts.put("width", "1000");
+    						 atts.put("widthPercentage", Integer.parseInt(w.substring(0,  w.length() -1)));
+    					 }
+
+    					 if (atts.get("height") == null || !isInt(atts.get("height"))) {
+    						 atts.put("height", "1000");
+    						 atts.put("heightPercentage", 100);
+    					 } else if (((String) atts.get("height")).endsWith("%")) {
+    						 String h = (String) atts.get("height");
+    						 atts.put("height", "1000");
+    						 atts.put("heightPercentage", Integer.parseInt(h.substring(0,  h.length() -1)));
+    					 }
+    				 }
+    				 else if (nm.equalsIgnoreCase("embed")) {
+    					 isEmbedTag = true;
+    					 atts = scanTag(in);
+
+    					 // If there is a classid present, transform it to code tag
+    					 if (atts.get("code") == null && atts.get("classid") != null && 
+    							 ((String) atts.get("classid")).startsWith("java:")) {
+    						 //skip "java:"
+    						 atts.put("code", ((String) atts.get("classid")).substring(5));
+    					 }
+
+    					 if (atts.get("code") == null && atts.get("object") == null) {
+    						 statusMsgStream.println(embedRequiresCodeWarning);
+    						 atts = null;
+    					 }
+    					 
+    					 if (atts.get("width") == null || !isInt(atts.get("width"))) {
+    						 atts.put("width", "1000");
     						 atts.put("widthPercentage", 100);
     					 } else if (((String) atts.get("width")).endsWith("%")) {
     						 String w = (String) atts.get("width");
@@ -1498,42 +1645,8 @@ import sun.misc.Ref;
     						 atts.put("widthPercentage", Integer.parseInt(w.substring(0,  w.length() -1)));
     					 }
 
-    					 if (atts.get("height") == null) {
-    						 atts.put("height", "100");
-    						 atts.put("heightPercentage", 100);
-    					 } else if (((String) atts.get("height")).endsWith("%")) {
-    						 String h = (String) atts.get("height");
-    						 atts.put("height", "100");
-    						 atts.put("heightPercentage", Integer.parseInt(h.substring(0,  h.length() -1)));
-    					 }
-    				 }
-    				 else if (nm.equalsIgnoreCase("embed")) {
-    					 isEmbedTag = true;
-    					 atts = scanTag(in);
-
-    					 // If there is a classid present, transform it to code tag
-    					 if (atts.get("code") == null && atts.get("classid") != null && 
-    							 ((String) atts.get("classid")).startsWith("java:")) {
-    						 //skip "java:"
-    						 atts.put("code", ((String) atts.get("classid")).substring(5));
-    					 }
-
-    					 if (atts.get("code") == null && atts.get("object") == null) {
-    						 statusMsgStream.println(embedRequiresCodeWarning);
-    						 atts = null;
-    					 }
-    					 
-    					 if (atts.get("width") == null) {
-    						 atts.put("width", "100");
-    						 atts.put("widthPercentage", 100);
-    					 } else if (((String) atts.get("width")).endsWith("%")) {
-    						 String w = (String) atts.get("width");
-    						 atts.put("width", "100");
-    						 atts.put("widthPercentage", Integer.parseInt(w.substring(0,  w.length() -1)));
-    					 }
-
-    					 if (atts.get("height") == null) {
-    						 atts.put("height", "100");
+    					 if (atts.get("height") == null || !isInt(atts.get("height"))) {
+    						 atts.put("height", "1000");
     						 atts.put("heightPercentage", 100);
     					 } else if (((String) atts.get("height")).endsWith("%")) {
     						 String h = (String) atts.get("height");
@@ -1554,17 +1667,17 @@ import sun.misc.Ref;
     						 atts2.remove("src");
     						 atts2.put("codebase", nm);
     					 }
-    					 if (atts2.get("width") == null) {
-    						 atts2.put("width", "100");
+    					 if (atts2.get("width") == null || !isInt(atts2.get("width"))) {
+    						 atts2.put("width", "1000");
     						 atts2.put("widthPercentage", 100);
     					 } else if (((String) atts.get("width")).endsWith("%")) {
     						 String w = (String) atts.get("width");
     						 atts2.put("width", "100");
     						 atts2.put("widthPercentage", Integer.parseInt(w.substring(0,  w.length() -1)));
     					 }
-    					 
-    					 if (atts2.get("height") == null) {
-    						 atts2.put("height", "100");
+
+    					 if (atts2.get("height") == null || !isInt(atts2.get("height"))) {
+    						 atts2.put("height", "1000");
     						 atts2.put("heightPercentage", 100);
     					 } else if (((String) atts.get("height")).endsWith("%")) {
     						 String h = (String) atts.get("height");
diff -r ccf50a917765 -r ff7010bc3cae rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Mon Nov 17 09:53:50 2008 -0500
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Tue Nov 18 11:04:46 2008 -0500
@@ -29,6 +29,7 @@ import java.security.Permission;
 import java.security.Permission;
 import java.security.PermissionCollection;
 import java.security.Permissions;
+import java.security.Policy;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -434,7 +435,7 @@ public class JNLPClassLoader extends URL
         // add in the permissions that the user granted.
         for (int i=0; i < runtimePermissions.size(); i++)
         	result.add(runtimePermissions.get(i));
-        
+
         return result;
     }
 
@@ -731,7 +732,7 @@ public class JNLPClassLoader extends URL
 
                         }
 
-                        // If it still fails, let it error out
+                        // If it still fails, let it error out                        
                         result = loadClassExt(name);
                     }
                 }
diff -r ccf50a917765 -r ff7010bc3cae rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java	Mon Nov 17 09:53:50 2008 -0500
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPPolicy.java	Tue Nov 18 11:04:46 2008 -0500
@@ -18,6 +18,7 @@ package net.sourceforge.jnlp.runtime;
 package net.sourceforge.jnlp.runtime;
 
 import java.security.*;


From gnu_andrew at member.fsf.org  Tue Nov 18 10:17:30 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 18 Nov 2008 18:17:30 +0000
Subject: changeset in /hg/icedtea: Cleanup remaining distcheck issues.
Message-ID: <hg.38c1a2fec933.1227032250.-6899778133799504387@icedtea.classpath.org>

changeset 38c1a2fec933 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=38c1a2fec933
description:
	Cleanup remaining distcheck issues.

	2008-11-18  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am: Fix issues with
		distcheck so generated, pulse-audio
		and plugin files are correctly removed.
		* acinclude.m4:
		Add conditional for native ecj,
		BUILD_NATIVE_ECJ.

diffstat:

3 files changed, 45 insertions(+), 20 deletions(-)
ChangeLog    |    9 +++++++++
Makefile.am  |   55 +++++++++++++++++++++++++++++++++++--------------------
acinclude.m4 |    1 +

diffs (172 lines):

diff -r 79d3c8c363dc -r 38c1a2fec933 ChangeLog
--- a/ChangeLog	Mon Nov 17 20:43:17 2008 +0000
+++ b/ChangeLog	Tue Nov 18 18:17:17 2008 +0000
@@ -1,3 +1,12 @@ 2008-11-17  Andrew John Hughes  <ahughes
+2008-11-18  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Fix issues with
+	distcheck so generated, pulse-audio
+	and plugin files are correctly removed.
+	* acinclude.m4:
+	Add conditional for native ecj,
+	BUILD_NATIVE_ECJ.
+
 2008-11-17  Andrew John Hughes  <ahughes at redhat.com>
 
 	* test/jtreg/excludelist.jdk.jtx:
diff -r 79d3c8c363dc -r 38c1a2fec933 Makefile.am
--- a/Makefile.am	Mon Nov 17 20:43:17 2008 +0000
+++ b/Makefile.am	Tue Nov 18 18:17:17 2008 +0000
@@ -32,11 +32,13 @@ if ENABLE_PULSE_JAVA
 # include the makefile in pulseaudio subdir
 PULSE_JAVA_DIR = $(abs_top_srcdir)/pulseaudio
 PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
+PULSE_JAVA_NATIVE_BUILDDIR = $(abs_top_builddir)/pulseaudio
 PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
 PULSE_JAVA_CLASS_DIR = $(abs_top_builddir)/pulseaudio
 else 
 PULSE_JAVA_DIR =
 PULSE_JAVA_NATIVE_SRCDIR =
+PULSE_JAVA_NATIVE_BUILDDIR = 
 PULSE_JAVA_JAVA_SRCDIR =
 PULSE_JAVA_CLASS_DIR =
 endif
@@ -75,6 +77,12 @@ endif
 	rm -rf visualvm
 	rm -rf netbeans
 	rm -f jni-common.o
+if BUILD_NATIVE_ECJ
+	rm -f native-ecj
+endif
+	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \
+	  rm -rf $(abs_top_builddir)/generated ; \
+	fi
 
 install:
 
@@ -1890,6 +1898,8 @@ endif
 endif
 	chmod -R ug+w openjdk 
 	sh $(srcdir)/fsg.sh ; 
+	find openjdk -name '*.java' \
+	  -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \
 	mkdir -p stamps 
 	touch stamps/extract.stamp
 
@@ -1985,6 +1995,7 @@ if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
 	mkdir -p rt
 	cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
+	chmod -R ug+w rt 
 endif
 
 clean-patch:
@@ -2072,7 +2083,7 @@ clean-patch-fsg:
 	  echo "WARNING Not all patches reverted cleanly" ; \
 	fi
 
-stamps/overlay.stamp: 
+stamps/overlay.stamp: stamps/extract.stamp
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{node|short}')`" ; \
 	fi ; \
@@ -2089,9 +2100,9 @@ stamps/overlay.stamp:
 	sed -i "s#IcedTea#IcedTea $${icedtea_version}#" openjdk/jdk/make/common/shared/Defs.gmk ; \
 	sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \
 	  openjdk/jdk/make/common/shared/Defs.gmk; \
-	find openjdk -name '*.java' -exec sed -i 's/^[[:space:]]*@Override//' {} + ; \
 	cp -r $(abs_top_srcdir)/overlays/openjdk/* openjdk/ \
 	  && touch stamps/overlay.stamp
+	chmod -R ug+w openjdk 
 
 # OpenJDK ecj Source Preparation Targets
 # ======================================
@@ -2476,12 +2487,12 @@ icedtea-debug-against-icedtea: \
 # OpenJDK ecj Targets
 # ===================
 
-stamps/native-ecj.stamp: 
-	mkdir -p stamps ; \
-	if test "x${GCJ}" != "xno"; then \
-	  ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -o native-ecj \
-	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
-	fi ; \
+stamps/native-ecj.stamp:
+	mkdir -p stamps 
+if BUILD_NATIVE_ECJ
+	${GCJ} ${CFLAGS} -Wl,-Bsymbolic -o native-ecj \
+	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR}
+endif
 	touch stamps/native-ecj.stamp
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
@@ -2737,7 +2748,9 @@ stamps/extra-class-files.stamp: extra-so
             -bootclasspath '' @extra-source-files.txt ; \
 	fi
 	cp -r $(abs_top_srcdir)/extra/net/sourceforge/jnlp/about/resources \
-	  extra-lib/net/sourceforge/jnlp/about
+	  extra-lib/net/sourceforge/jnlp/about	
+	find extra-lib/net/sourceforge/jnlp/about -type f -exec chmod 640 '{}' ';' \
+	  -o -type d -exec chmod 750 '{}' ';'
 	mkdir -p stamps
 	touch $@
 
@@ -2874,6 +2887,7 @@ if ENABLE_PULSE_JAVA
 		) \
         fi
 	cp  -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
+	chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
 endif
 	mkdir -p stamps
 	touch stamps/pulse-java-class.stamp
@@ -2883,17 +2897,17 @@ if ENABLE_PULSE_JAVA
 if ENABLE_PULSE_JAVA
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
-	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
-	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
-	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
-	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
+	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
+	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
+	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+	  $(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
 	else \
-	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
-	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
-	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
-	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_SRCDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
+	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
+	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
+	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+	  $(ICEDTEA_BOOT_DIR)/bin/javah -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
 	fi
 endif
 	mkdir -p stamps
@@ -2903,10 +2917,11 @@ clean-pulse-java:
 clean-pulse-java:
 if ENABLE_PULSE_JAVA
 	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || find $(PULSE_JAVA_CLASS_DIR) -name '*.class' | xargs -r rm -f
-	[ -z "$(PULSE_JAVA_NATIVE_SRCDIR)" ] || rm -f $(PULSE_JAVA_NATIVE_SRCDIR)/org_*.h $(PULSE_JAVA_NATIVE_SRCDIR)/*.o
+	[ -z "$(PULSE_JAVA_NATIVE_BUILDDIR)" ] || rm -f $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*.h $(PULSE_JAVA_NATIVE_BUILDDIR)/*.o
 	rm -f stamps/pulse-java*.stamp
 	rm -f pulse-java.jar
 	rm -f libpulse-java.so
+	rm -rf $(PULSE_JAVA_CLASS_DIR)/META-INF
 endif
 
 # end of pulse-java
diff -r 79d3c8c363dc -r 38c1a2fec933 acinclude.m4
--- a/acinclude.m4	Mon Nov 17 20:43:17 2008 +0000
+++ b/acinclude.m4	Tue Nov 18 18:17:17 2008 +0000
@@ -1008,5 +1008,6 @@ AC_DEFUN([AC_CHECK_WITH_GCJ],
   if test "x${GCJ}" = xyes; then
     AC_PATH_TOOL([GCJ],[gcj])
   fi
+  AM_CONDITIONAL([BUILD_NATIVE_ECJ], test x"${GCJ}" != xno)
   AC_SUBST([GCJ])
 ])


From gnu_andrew at member.fsf.org  Wed Nov 19 04:47:30 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 19 Nov 2008 12:47:30 +0000
Subject: changeset in /hg/icedtea: Reapply mjw's version patch.
Message-ID: <hg.1427ec4417d3.1227098850.-6899778133799504387@icedtea.classpath.org>

changeset 1427ec4417d3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1427ec4417d3
description:
	Reapply mjw's version patch.

	2008-11-19  Andrew John Hughes  <ahughes at redhat.com>

		* patches/icedtea-version.patch,
		Reapply Mark Wielaard's patch from
		recent merge.

diffstat:

2 files changed, 26 insertions(+), 19 deletions(-)
ChangeLog                     |    6 ++++++
patches/icedtea-version.patch |   39 ++++++++++++++++++++-------------------

diffs (88 lines):

diff -r 38c1a2fec933 -r 1427ec4417d3 ChangeLog
--- a/ChangeLog	Tue Nov 18 18:17:17 2008 +0000
+++ b/ChangeLog	Wed Nov 19 12:47:19 2008 +0000
@@ -1,3 +1,9 @@ 2008-11-18  Andrew John Hughes  <ahughes
+2008-11-19  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-version.patch,
+	Reapply Mark Wielaard's patch from
+	recent merge.
+	
 2008-11-18  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Fix issues with
diff -r 38c1a2fec933 -r 1427ec4417d3 patches/icedtea-version.patch
--- a/patches/icedtea-version.patch	Tue Nov 18 18:17:17 2008 +0000
+++ b/patches/icedtea-version.patch	Wed Nov 19 12:47:19 2008 +0000
@@ -1,6 +1,6 @@ diff -Nru openjdk.orig/hotspot/make/linu
 diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
---- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2008-10-09 08:42:26.000000000 +0100
-+++ openjdk/hotspot/make/linux/makefiles/vm.make	2008-10-24 10:08:32.000000000 +0100
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2008-11-06 08:40:50.000000000 +0000
++++ openjdk/hotspot/make/linux/makefiles/vm.make	2008-11-19 12:15:54.000000000 +0000
 @@ -86,6 +86,10 @@
    ${JRE_VERSION}     \
    ${VM_DISTRO}
@@ -13,8 +13,8 @@ diff -Nru openjdk.orig/hotspot/make/linu
  CFLAGS += $(CFLAGS_WARN/BYFILE)
  
 diff -Nru openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp openjdk/hotspot/src/share/vm/runtime/arguments.cpp
---- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp	2008-10-09 08:42:33.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2008-10-24 10:08:32.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/runtime/arguments.cpp	2008-11-06 08:40:57.000000000 +0000
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	2008-11-19 12:15:54.000000000 +0000
 @@ -25,7 +25,7 @@
  #include "incls/_precompiled.incl"
  #include "incls/_arguments.cpp.incl"
@@ -25,8 +25,8 @@ diff -Nru openjdk.orig/hotspot/src/share
  
  char**  Arguments::_jvm_flags_array             = NULL;
 diff -Nru openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp openjdk/hotspot/src/share/vm/utilities/vmError.cpp
---- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp	2008-10-09 08:42:34.000000000 +0100
-+++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp	2008-10-24 10:08:32.000000000 +0100
+--- openjdk.orig/hotspot/src/share/vm/utilities/vmError.cpp	2008-11-06 08:40:58.000000000 +0000
++++ openjdk/hotspot/src/share/vm/utilities/vmError.cpp	2008-11-19 12:15:54.000000000 +0000
 @@ -165,7 +165,8 @@
  
  static void print_bug_submit_message(outputStream *out, Thread *thread) {
@@ -48,8 +48,8 @@ diff -Nru openjdk.orig/hotspot/src/share
    STEP(60, "(printing problematic frame)")
  
 diff -Nru openjdk.orig/jdk/make/common/shared/Defs.gmk openjdk/jdk/make/common/shared/Defs.gmk
---- openjdk.orig/jdk/make/common/shared/Defs.gmk	2008-10-09 08:45:42.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Defs.gmk	2008-10-24 10:08:32.000000000 +0100
+--- openjdk.orig/jdk/make/common/shared/Defs.gmk	2008-11-06 08:44:09.000000000 +0000
++++ openjdk/jdk/make/common/shared/Defs.gmk	2008-11-19 12:15:54.000000000 +0000
 @@ -189,8 +189,8 @@
  
  # Default names
@@ -61,17 +61,18 @@ diff -Nru openjdk.orig/jdk/make/common/s
    PRODUCT_SUFFIX = Runtime Environment
    JDK_RC_PLATFORM_NAME = Platform
    COMPANY_NAME = N/A
-@@ -255,12 +255,7 @@
- JDK_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_VERSION))
- JDK_MKTG_UNDERSCORE_VERSION =  $(subst .,_,$(JDK_MKTG_VERSION))
+diff -Nru openjdk.orig/langtools/make/Makefile openjdk/langtools/make/Makefile
+--- openjdk.orig/langtools/make/Makefile	2008-11-19 12:16:39.000000000 +0000
++++ openjdk/langtools/make/Makefile	2008-11-19 12:17:38.000000000 +0000
+@@ -82,7 +82,11 @@
+ endif 
  
--# RELEASE is JDK_VERSION and -MILESTONE if MILESTONE is set
--ifneq ($(MILESTONE),fcs)
--  RELEASE      = $(JDK_VERSION)-$(MILESTONE)$(BUILD_VARIANT_RELEASE)
--else
--  RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
--endif
-+RELEASE      = $(JDK_VERSION)$(BUILD_VARIANT_RELEASE)
+ ifdef MILESTONE
++ifneq ($(MILESTONE),fcs)
+   ANT_OPTIONS += -Dmilestone=$(MILESTONE)
++else
++  ANT_OPTIONS += -Drelease=$(JDK_VERSION)
++endif
+ endif
  
- # FULL_VERSION is RELEASE and -BUILD_NUMBER if BUILD_NUMBER is set
  ifdef BUILD_NUMBER


From Joe.Darcy at Sun.COM  Wed Nov 19 08:14:27 2008
From: Joe.Darcy at Sun.COM (Joseph D. Darcy)
Date: Wed, 19 Nov 2008 08:14:27 -0800
Subject: sun proprietary/confidential JarFromManifestFailure.java in
	openjdk6
In-Reply-To: <4921092C.3020808@sun.com>
References: <1226839334.26105.15.camel@hermans.wildebeest.org>
	<49207EA0.80803@sun.com> <4921092C.3020808@sun.com>
Message-ID: <49243B63.5020602@sun.com>

Joseph D. Darcy wrote:
> Joseph D. Darcy wrote:
>> Hello.
>>
>> Mark Wielaard wrote:
>>> Hi,
>>>
>>> I just filed http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=258
>>>
>>> In jdk6 
>>> langtools/test/tools/javac/Paths/6638501/JarFromManifestFailure.java is
>>> marked as "SUN PROPRIETARY/CONFIDENTIAL" while the version in jdk7 
>>> is under the
>>> GPL.
>>>
>>> The version in jdk7 was alsways under the GPL, and never marked as
>>> proprietary, but the version as imported in jdk6-b05 and updated in
>>> jdk6-b13 was.
>>>   
>>
>> Sorry about that; I've filed Sun bug 6772068 for this issue and it 
>> will be fixed in the next OpenJDK 6 build.
>>
>> -Joe
>>
>>
>
> The bug is now fixed in the upstream OpenJDK 6 sources; below is the 
> patch.
>
> Cheers,
>
> -Joe
>

On a related note, below a few fixes to malformed copyright statements 
for bug 6773363: Fix bad copyrights in src/share/classes/java/awt/dnd 
and test/javax/script/Test3.java.  These fixes will be in the next 
OpenJDK 6 build.

-Joe

--- old/src/share/classes/java/awt/dnd/DragSource.java	Tue Nov 18 22:18:49 2008
+++ new/src/share/classes/java/awt/dnd/DragSource.java	Tue Nov 18 22:18:49 2008
@@ -7,10 +7,6 @@
  * published by the Free Software Foundation.  Sun designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
-import java.awt.AWTError;
-import java.awt.AWTException;
-import java.awt.event.InputEvent;
-import java.awt.AWTPermission;
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -22,7 +18,6 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
-import java.io.Serializable;
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
  * have any questions.
--- old/src/share/classes/java/awt/dnd/DragSourceContext.java	Tue Nov 18 22:18:52 2008
+++ new/src/share/classes/java/awt/dnd/DragSourceContext.java	Tue Nov 18 22:18:52 2008
@@ -7,7 +7,6 @@
  * published by the Free Software Foundation.  Sun designates this
  * particular file as subject to the "Classpath" exception as provided
  * by Sun in the LICENSE file that accompanied this code.
-import java.awt.event.InputEvent;
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -17,11 +16,6 @@
  *
  * You should have received a copy of the GNU General Public License version
  * 2 along with this work; if not, write to the Free Software Foundation,
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceListener;
-import java.awt.dnd.InvalidDnDOperationException;
-
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
--- old/test/javax/script/Test3.java	Tue Nov 18 22:18:53 2008
+++ new/test/javax/script/Test3.java	Tue Nov 18 22:18:53 2008
@@ -4,7 +4,6 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
-
  * published by the Free Software Foundation.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT







From bugzilla-daemon at icedtea.classpath.org  Wed Nov 19 10:00:01 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 19 Nov 2008 18:00:01 +0000
Subject: [Bug 259] New: i found that error in my ~/ so i`m adding it
Message-ID: <E1L2rLN-0000q7-B3@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=259

           Summary: i found that error in my ~/ so i`m adding it
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: anonim1133 at wp.pl


#
# An unexpected error has been detected by Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0xaf989334, pid=6541, tid=3028220816
#
# Java VM: OpenJDK Client VM (1.6.0_0-b11 mixed mode, sharing linux-x86)
# Problematic frame:
# C  0xaf989334
#
# If you would like to submit a bug report, please visit:
#   http://icedtea.classpath.org/bugzilla
#

---------------  T H R E A D  ---------------

Current thread is native thread

siginfo:si_signo=SIGSEGV: si_errno=0, si_code=1 (SEGV_MAPERR),
si_addr=0xaf989334

Registers:
EAX=0xb1995df4, EBX=0xaedf7554, ECX=0xb19d5e98, EDX=0xb1969bf4
ESP=0xb47ef38c, EBP=0xb47ef3b8, ESI=0x00000001, EDI=0x00000080
EIP=0xaf989334, CR2=0xaf989334, EFLAGS=0x00010282

Top of Stack: (sp=0xb47ef38c)
0xb47ef38c:   aedd7598 b19d5e98 00000001 b47ef3b8
0xb47ef39c:   aede8720 b1995df0 00000001 00000004
0xb47ef3ac:   aedf7554 b16152b0 00000001 b47ef3d8
0xb47ef3bc:   aededa0b b16152b0 b4397458 b040540b
0xb47ef3cc:   b7ee4ff4 0000000b b7ee51b8 b47ef4c8
0xb47ef3dc:   b7ed556a b16152b0 00000000 00000000
0xb47ef3ec:   00000000 00000000 b7ee5160 b47efb90
0xb47ef3fc:   00000000 b47efbfc 00000000 00000000 

Instructions: (pc=0xaf989334)
0xaf989324:   
[error occurred during error reporting (printing registers, top of stack,
instructions near pc), id 0xb]

Stack: [0xb479f000,0xb47f0000],  sp=0xb47ef38c,  free space=320k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C  0xaf989334
C  [libnspr4.so.0d+0x27a0b]
C  [libpthread.so.0+0x656a]


---------------  P R O C E S S  ---------------

VM state:not at safepoint (normal execution)

VM Mutex/Monitor currently owned by a thread: None

Heap
 def new generation   total 2304K, used 322K [0x4f840000, 0x4fac0000,
0x54700000)
  eden space 2048K,  13% used [0x4f840000, 0x4f886ba8, 0x4fa40000)
  from space 256K,  15% used [0x4fa40000, 0x4fa49d90, 0x4fa80000)
  to   space 256K,   0% used [0x4fa80000, 0x4fa80000, 0x4fac0000)
 tenured generation   total 29820K, used 29143K [0x54700000, 0x5641f000,
0x8f840000)
   the space 29820K,  97% used [0x54700000, 0x56375ee0, 0x56376000, 0x5641f000)
 compacting perm gen  total 18176K, used 18060K [0x8f840000, 0x90a00000,
0x93840000)
   the space 18176K,  99% used [0x8f840000, 0x909e3060, 0x909e3200, 0x90a00000)
    ro space 8192K,  89% used [0x93840000, 0x93f6ab58, 0x93f6ac00, 0x94040000)
    rw space 12288K,  59% used [0x94040000, 0x94768378, 0x94768400, 0x94c40000)

Dynamic libraries:
08048000-08050000 r-xp 00000000 08:02 1303143   
/usr/lib/jvm/java-6-openjdk/jre/bin/java
08050000-08051000 rw-p 00008000 08:02 1303143   
/usr/lib/jvm/java-6-openjdk/jre/bin/java
08153000-09318000 rw-p 08153000 00:00 0          [heap]
4f840000-4fac0000 rwxp 4f840000 00:00 0 
4fac0000-54700000 rwxp 4fac0000 00:00 0 
54700000-5641f000 rwxp 54700000 00:00 0 
5641f000-8f840000 rwxp 5641f000 00:00 0 
8f840000-90a00000 rwxp 8f840000 00:00 0 
90a00000-93840000 rwxp 90a00000 00:00 0 
93840000-93f6b000 r--s 00001000 08:02 1288293   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa
93f6b000-94040000 rwxp 93f6b000 00:00 0 
94040000-94769000 rw-p 0072c000 08:02 1288293   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa
94769000-94c40000 rwxp 94769000 00:00 0 
94c40000-94d37000 rw-p 00e55000 08:02 1288293   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa
94d37000-95040000 rwxp 94d37000 00:00 0 
95040000-95044000 r-xs 00f4c000 08:02 1288293   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa
95044000-95440000 rwxp 95044000 00:00 0 
aa600000-aa6d4000 rw-p aa600000 00:00 0 
aa6d4000-aa700000 ---p aa6d4000 00:00 0 
aaafc000-ab0fc000 rw-p aaafc000 00:00 0 
ab0fc000-ab100000 ---p ab0fc000 00:00 0 
ab100000-ab1fc000 rw-p ab100000 00:00 0 
ab1fc000-ab200000 ---p ab1fc000 00:00 0 
ab200000-ab2fd000 rw-p ab200000 00:00 0 
ab2fd000-ab300000 ---p ab2fd000 00:00 0 
ab400000-ab4fc000 rw-p ab400000 00:00 0 
ab4fc000-ab500000 ---p ab4fc000 00:00 0 
ab500000-ab5fc000 rw-p ab500000 00:00 0 
ab5fc000-ab600000 ---p ab5fc000 00:00 0 
ab600000-ab6fc000 rw-p ab600000 00:00 0 
ab6fc000-ab700000 ---p ab6fc000 00:00 0 
ab800000-ab8fc000 rw-p ab800000 00:00 0 
ab8fc000-ab900000 ---p ab8fc000 00:00 0 
ab94d000-abc00000 r--p 00000000 08:02 490509    
/usr/share/icons/hicolor/icon-theme.cache
abc00000-abd00000 rw-p abc00000 00:00 0 
abd31000-abd92000 r-xp 00000000 08:02 431029     /usr/lib/libgio-2.0.so.0.0.0
abd92000-abd94000 rw-p 00060000 08:02 431029     /usr/lib/libgio-2.0.so.0.0.0
abd94000-abdc5000 r-xp 00000000 08:02 427193     /usr/lib/libcroco-0.6.so.3.0.1
abdc5000-abdc8000 rw-p 00030000 08:02 427193     /usr/lib/libcroco-0.6.so.3.0.1
abdc8000-abdfc000 r-xp 00000000 08:02 426767     /usr/lib/libgsf-1.so.114.0.10
abdfc000-abdff000 rw-p 00033000 08:02 426767     /usr/lib/libgsf-1.so.114.0.10
abdff000-abf00000 rw-p abdff000 00:00 0 
abf1c000-abf4c000 r-xp 00000000 08:02 426128     /usr/lib/librsvg-2.so.2.22.2
abf4c000-abf4d000 rw-p 00030000 08:02 426128     /usr/lib/librsvg-2.so.2.22.2
ac200000-ac300000 rw-p ac200000 00:00 0 
ac319000-ac328000 r-xp 00000000 08:02 1107670    /lib/libbz2.so.1.0.4
ac328000-ac329000 rw-p 0000f000 08:02 1107670    /lib/libbz2.so.1.0.4
ac329000-ac374000 r--p 00000000 08:02 896276    
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
ac374000-ac375000 ---p ac374000 00:00 0 
ac375000-acb75000 rwxp ac375000 00:00 0 
acb75000-acbb6000 r-xp 00000000 08:02 928474     /usr/lib/nss/libnssckbi.so
acbb6000-acbc0000 rw-p 00040000 08:02 928474     /usr/lib/nss/libnssckbi.so
acbc0000-acbfb000 r-xp 00000000 08:02 928471     /usr/lib/nss/libfreebl3.so
acbfb000-acbfc000 rw-p 0003a000 08:02 928471     /usr/lib/nss/libfreebl3.so
acbfc000-acbfd000 ---p acbfc000 00:00 0 
acbfd000-ad3fd000 rwxp acbfd000 00:00 0 
ad3fd000-ad3fe000 ---p ad3fd000 00:00 0 
ad3fe000-adbfe000 rwxp ad3fe000 00:00 0 
adbfe000-adbff000 ---p adbfe000 00:00 0 
adbff000-ae3ff000 rwxp adbff000 00:00 0 
ae3ff000-ae400000 ---p ae3ff000 00:00 0 
ae400000-aec00000 rwxp ae400000 00:00 0 
aec00000-aed00000 rw-p aec00000 00:00 0 
aedc6000-aedf7000 r-xp 00000000 08:02 423565     /usr/lib/libnspr4.so.0d
aedf7000-aedf8000 rw-p 00031000 08:02 423565     /usr/lib/libnspr4.so.0d
aedf8000-aedfa000 rw-p aedf8000 00:00 0 
aee3d000-aee4e000 r-xp 00000000 08:02 426912     /usr/lib/libnssutil3.so.1d
aee4e000-aee51000 rw-p 00010000 08:02 426912     /usr/lib/libnssutil3.so.1d
afc00000-afcfc000 rw-p afc00000 00:00 0 
afcfc000-afd00000 ---p afcfc000 00:00 0 
afd00000-afdff000 rw-p afd00000 00:00 0 
afdff000-afe00000 ---p afdff000 00:00 0 
afe00000-afefd000 rw-p afe00000 00:00 0 
afefd000-aff00000 ---p afefd000 00:00 0 
aff00000-afffc000 rw-p aff00000 00:00 0 
afffc000-b0000000 ---p afffc000 00:00 0 
b0000000-b00f8000 rw-p b0000000 00:00 0 
b00f8000-b0100000 ---p b00f8000 00:00 0 
b0120000-b0126000 r--s 00098000 08:02 619897     /usr/share/java/js-1.7R1.jar
b0126000-b0138000 r-xp 00000000 08:02 993756    
/usr/lib/jni/libswt-xulrunner-gtk-3448.so
b0138000-b0139000 rw-p 00011000 08:02 993756    
/usr/lib/jni/libswt-xulrunner-gtk-3448.so
b022d000-b023f000 r--s 00000000 08:02 492081     /usr/share/mime/mime.cache
b023f000-b024b000 r-xp 00000000 08:02 1107613    /lib/libgcc_s.so.1
b024b000-b024c000 rw-p 0000b000 08:02 1107613    /lib/libgcc_s.so.1
b024c000-b032f000 r-xp 00000000 08:02 424055     /usr/lib/libstdc++.so.6.0.10
b032f000-b0332000 r--p 000e2000 08:02 424055     /usr/lib/libstdc++.so.6.0.10
b0332000-b0334000 rw-p 000e5000 08:02 424055     /usr/lib/libstdc++.so.6.0.10
b0334000-b033a000 rw-p b0334000 00:00 0 
b033a000-b0351000 r-xp 00000000 08:02 1107736    /lib/libselinux.so.1
b0351000-b0353000 rw-p 00016000 08:02 1107736    /lib/libselinux.so.1
b0354000-b0356000 r-xp 00000000 08:02 436893     /usr/lib/gconv/UTF-16.so
b0356000-b0358000 rw-p 00001000 08:02 436893     /usr/lib/gconv/UTF-16.so
b0358000-b035e000 r-xp 00000000 08:02 993757    
/usr/lib/jni/libswt-xpcominit-gtk-3448.so
b035e000-b035f000 rw-p 00005000 08:02 993757    
/usr/lib/jni/libswt-xpcominit-gtk-3448.so
b035f000-b0371000 r--s 00000000 08:02 492081     /usr/share/mime/mime.cache
b0371000-b03d7000 r-xp 00000000 08:02 428718     /usr/lib/libgcrypt.so.11.4.4
b03d7000-b03d9000 rw-p 00066000 08:02 428718     /usr/lib/libgcrypt.so.11.4.4
b03d9000-b03e8000 r-xp 00000000 08:02 427099     /usr/lib/libtasn1.so.3.0.16
b03e8000-b03e9000 rw-p 0000e000 08:02 427099     /usr/lib/libtasn1.so.3.0.16
b03e9000-b0432000 r-xp 00000000 08:02 433438     /usr/lib/libORBit-2.so.0.1.0
b0432000-b043b000 rw-p 00049000 08:02 433438     /usr/lib/libORBit-2.so.0.1.0
b043b000-b043c000 rw-p b043b000 00:00 0 
b043c000-b0450000 r-xp 00000000 08:02 429879     /usr/lib/libICE.so.6.3.0
b0450000-b0451000 rw-p 00014000 08:02 429879     /usr/lib/libICE.so.6.3.0
b0451000-b0453000 rw-p b0451000 00:00 0 
b0453000-b0468000 r-xp 00000000 08:02 2557905   
/usr/lib/libart_lgpl_2.so.2.3.20
b0468000-b0469000 rw-p 00014000 08:02 2557905   
/usr/lib/libart_lgpl_2.so.2.3.20
b0469000-b04c4000 r-xp 00000000 08:02 2557912   
/usr/lib/libbonoboui-2.so.0.0.0
b04c4000-b04c7000 rw-p 0005a000 08:02 2557912   
/usr/lib/libbonoboui-2.so.0.0.0
b04c7000-b05fa000 r-xp 00000000 08:02 433120     /usr/lib/libxml2.so.2.6.32
b05fa000-b05ff000 rw-p 00132000 08:02 433120     /usr/lib/libxml2.so.2.6.32
b05ff000-b06fa000 rw-p b05ff000 00:00 0 
b06fa000-b0700000 ---p b06fa000 00:00 0 
b0700000-b0796000 rw-p b0700000 00:00 0 
b0796000-b0800000 ---p b0796000 00:00 0 
b0800000-b09fd000 rw-p b0800000 00:00 0 
b09fd000-b0a00000 ---p b09fd000 00:00 0 
b0a00000-b0c00000 rw-p b0a00000 00:00 0 
b0c00000-b0cfe000 rw-p b0c00000 00:00 0 
b0cfe000-b0d00000 ---p b0cfe000 00:00 0 
b0d00000-b0e00000 rw-p b0d00000 00:00 0 
b0e00000-b1000000 rw-p b0e00000 00:00 0 
b1000000-b1200000 rw-p b1000000 00:00 0 
b1200000-b1400000 rw-p b1200000 00:00 0 
b1400000-b1500000 rw-p b1400000 00:00 0 
b1500000-b150f000 r-xp 00000000 08:02 425009    
/usr/lib/libgnome-keyring.so.0.1.1
b150f000-b1510000 rw-p 0000f000 08:02 425009    
/usr/lib/libgnome-keyring.so.0.1.1
b1510000-b153f000 r-xp 00000000 08:02 423915    
/usr/lib/libgnomecanvas-2.so.0.2001.0
b153f000-b1540000 rw-p 0002f000 08:02 423915    
/usr/lib/libgnomecanvas-2.so.0.2001.0
b1540000-b1560000 r-xp 00000000 08:02 423734     /usr/lib/libaudiofile.so.0.0.2
b1560000-b1563000 rw-p 0001f000 08:02 423734     /usr/lib/libaudiofile.so.0.0.2
b1563000-b15fa000 r-xp 00000000 08:02 432040     /usr/lib/libgnutls.so.26.4.6
b15fa000-b1600000 rw-p 00097000 08:02 432040     /usr/lib/libgnutls.so.26.4.6
b1600000-b1700000 rw-p b1600000 00:00 0 
b1703000-b1715000 r-xp 00000000 08:02 2557907   
/usr/lib/libbonobo-activation.so.4.0.0
b1715000-b1717000 rw-p 00012000 08:02 2557907   
/usr/lib/libbonobo-activation.so.4.0.0
b1717000-b1769000 r-xp 00000000 08:02 2557908    /usr/lib/libbonobo-2.so.0.0.0
b1769000-b1773000 rw-p 00051000 08:02 2557908    /usr/lib/libbonobo-2.so.0.0.0
b1773000-b17fc000 r-xp 00000000 08:02 430647    
/usr/lib/libgnomeui-2.so.0.2000.1
b17fc000-b1800000 rw-p 00088000 08:02 430647    
/usr/lib/libgnomeui-2.so.0.2000.1
b1800000-b19fd000 rw-p b1800000 00:00 0 
b19fd000-b1a00000 ---p b19fd000 00:00 0 
b1a00000-b1afe000 rw-p b1a00000 00:00 0 
b1afe000-b1b00000 ---p b1afe000 00:00 0 
b1b00000-b1bfe000 rw-p b1b00000 00:00 0 
b1bfe000-b1c00000 ---p b1bfe000 00:00 0 
b1c00000-b1ceb000 rw-p b1c00000 00:00 0 
b1ceb000-b1d00000 ---p b1ceb000 00:00 0 
b1d00000-b1d01000 r-xp 00000000 08:02 619841    
/usr/lib/gtk-2.0/2.10.0/loaders/svg_loader.so
b1d01000-b1d02000 rw-p 00000000 08:02 619841    
/usr/lib/gtk-2.0/2.10.0/loaders/svg_loader.so
b1d02000-b1d06000 r-xp 00000000 08:02 1107678    /lib/libattr.so.1.1.0
b1d06000-b1d07000 rw-p 00003000 08:02 1107678    /lib/libattr.so.1.1.0
b1d07000-b1d0d000 r-xp 00000000 08:02 425385     /usr/lib/libgailutil.so.18.0.1
b1d0d000-b1d0e000 rw-p 00006000 08:02 425385     /usr/lib/libgailutil.so.18.0.1
b1d0e000-b1d66000 r-xp 00000000 08:02 429635    
/usr/lib/libgnomevfs-2.so.0.2200.0
b1d66000-b1d69000 rw-p 00057000 08:02 429635    
/usr/lib/libgnomevfs-2.so.0.2200.0
b1d69000-b1d6c000 rwxp b1d69000 00:00 0 
b1d6c000-b1dba000 rwxp b1d6c000 00:00 0 
b1dba000-b1dbd000 ---p b1dba000 00:00 0 
b1dbd000-b1e0b000 rwxp b1dbd000 00:00 0 
b1e0b000-b1e0e000 ---p b1e0b000 00:00 0 
b1e0e000-b1e5c000 rwxp b1e0e000 00:00 0 
b1e5c000-b1e5f000 ---p b1e5c000 00:00 0 
b1e5f000-b1ead000 rwxp b1e5f000 00:00 0 
b1ead000-b1eaf000 r--s 00003000 08:04 12419074  
/home/anonim1133/.azureus/plugins/azfocus/azfocus_0.3.jar
b1eaf000-b1eb3000 r-xp 00000000 08:02 431730    
/usr/lib/libORBitCosNaming-2.so.0.1.0
b1eb3000-b1eb4000 rw-p 00003000 08:02 431730    
/usr/lib/libORBitCosNaming-2.so.0.1.0
b1eb4000-b1ec3000 r-xp 00000000 08:02 426338    
/usr/lib/libavahi-client.so.3.2.4
b1ec3000-b1ec4000 rw-p 0000e000 08:02 426338    
/usr/lib/libavahi-client.so.3.2.4
b1ec4000-b1efa000 r-xp 00000000 08:02 433023     /usr/lib/libdbus-1.so.3.4.0
b1efa000-b1efc000 rw-p 00035000 08:02 433023     /usr/lib/libdbus-1.so.3.4.0
b1f03000-b1f07000 r-xp 00000000 08:02 620055    
/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so
b1f07000-b1f08000 rw-p 00003000 08:02 620055    
/usr/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so
b1f08000-b1f0a000 r-xp 00000000 08:02 425273     /usr/lib/libXss.so.1.0.0
b1f0a000-b1f0b000 rw-p 00001000 08:02 425273     /usr/lib/libXss.so.1.0.0
b1f0b000-b1f0e000 rwxp b1f0b000 00:00 0 
b1f0e000-b1f5c000 rwxp b1f0e000 00:00 0 
b1f5c000-b1f5f000 ---p b1f5c000 00:00 0 
b1f5f000-b1fad000 rwxp b1f5f000 00:00 0 
b1fad000-b1fb0000 ---p b1fad000 00:00 0 
b1fb0000-b1ffe000 rwxp b1fb0000 00:00 0 
b1ffe000-b2005000 r-xp 00000000 08:02 429429     /usr/lib/libSM.so.6.0.0
b2005000-b2006000 rw-p 00006000 08:02 429429     /usr/lib/libSM.so.6.0.0
b2006000-b2083000 r--p 00000000 08:02 896298    
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
b2083000-b2100000 r--p 00000000 08:02 896295    
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
b2100000-b21fc000 rw-p b2100000 00:00 0 
b21fc000-b2200000 ---p b21fc000 00:00 0 
b2201000-b2209000 r-xp 00000000 08:02 1107615    /lib/libpopt.so.0.0.0
b2209000-b220a000 rw-p 00007000 08:02 1107615    /lib/libpopt.so.0.0.0
b220a000-b2225000 r-xp 00000000 08:02 439530    
/usr/lib/libdbus-glib-1.so.2.1.0
b2225000-b2226000 rw-p 0001b000 08:02 439530    
/usr/lib/libdbus-glib-1.so.2.1.0
b2226000-b22af000 r--p 00000000 08:02 896273    
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
b22af000-b22b2000 ---p b22af000 00:00 0 
b22b2000-b2300000 rwxp b22b2000 00:00 0 
b2300000-b23ff000 rw-p b2300000 00:00 0 
b23ff000-b2400000 ---p b23ff000 00:00 0 
b2400000-b2403000 r-xp 00000000 08:02 423566     /usr/lib/libplc4.so.0d
b2403000-b2404000 rw-p 00002000 08:02 423566     /usr/lib/libplc4.so.0d
b2404000-b240c000 r-xp 00000000 08:02 431977     /usr/lib/libesd.so.0.2.36
b240c000-b240d000 rw-p 00007000 08:02 431977     /usr/lib/libesd.so.0.2.36
b240d000-b2410000 ---p b240d000 00:00 0 
b2410000-b245e000 rwxp b2410000 00:00 0 
b245e000-b2461000 ---p b245e000 00:00 0 
b2461000-b24af000 rwxp b2461000 00:00 0 
b24af000-b24b2000 ---p b24af000 00:00 0 
b24b2000-b2500000 rwxp b24b2000 00:00 0 
b2500000-b25ff000 rw-p b2500000 00:00 0 
b25ff000-b2600000 ---p b25ff000 00:00 0 
b2600000-b2602000 r-xp 00000000 08:02 423567     /usr/lib/libplds4.so.0d
b2602000-b2603000 rw-p 00001000 08:02 423567     /usr/lib/libplds4.so.0d
b2603000-b260e000 r-xp 00000000 08:02 428787    
/usr/lib/libavahi-common.so.3.5.0
b260e000-b260f000 rw-p 0000a000 08:02 428787    
/usr/lib/libavahi-common.so.3.5.0
b260f000-b263e000 r-xp 00000000 08:02 429296     /usr/lib/libgconf-2.so.4.1.5
b263e000-b2641000 rw-p 0002e000 08:02 429296     /usr/lib/libgconf-2.so.4.1.5
b2641000-b2644000 ---p b2641000 00:00 0 
b2644000-b2692000 rwxp b2644000 00:00 0 
b2692000-b2695000 ---p b2692000 00:00 0 
b2695000-b26e3000 rwxp b2695000 00:00 0 
b26e3000-b26e6000 ---p b26e3000 00:00 0 
b26e6000-b2734000 rwxp b26e6000 00:00 0 
b2734000-b2737000 ---p b2734000 00:00 0 
b2737000-b2785000 rwxp b2737000 00:00 0 
b2785000-b2788000 ---p b2785000 00:00 0 
b2788000-b27d6000 rwxp b2788000 00:00 0 
b27d6000-b27d9000 ---p b27d6000 00:00 0 
b27d9000-b2827000 rwxp b27d9000 00:00 0 
b2827000-b282a000 ---p b2827000 00:00 0 
b282a000-b2878000 rwxp b282a000 00:00 0 
b2878000-b287b000 ---p b2878000 00:00 0 
b287b000-b28c9000 rwxp b287b000 00:00 0 
b28c9000-b28cc000 ---p b28c9000 00:00 0 
b28cc000-b291a000 rwxp b28cc000 00:00 0 
b291a000-b291d000 rwxp b291a000 00:00 0 
b291d000-b296b000 rwxp b291d000 00:00 0 
b296b000-b296e000 ---p b296b000 00:00 0 
b296e000-b29bc000 rwxp b296e000 00:00 0 
b29bc000-b29bf000 ---p b29bc000 00:00 0 
b29bf000-b2a0d000 rwxp b29bf000 00:00 0 
b2a0d000-b2a10000 ---p b2a0d000 00:00 0 
b2a10000-b2a5e000 rwxp b2a10000 00:00 0 
b2a5e000-b2a61000 ---p b2a5e000 00:00 0 
b2a61000-b2aaf000 rwxp b2a61000 00:00 0 
b2aaf000-b2ab2000 ---p b2aaf000 00:00 0 
b2ab2000-b2b00000 rwxp b2ab2000 00:00 0 
b2b00000-b2bfd000 rw-p b2b00000 00:00 0 
b2bfd000-b2c00000 ---p b2bfd000 00:00 0 
b2c01000-b2c04000 r-xp 00000000 08:02 424547     /usr/lib/libgpg-error.so.0.3.0
b2c04000-b2c05000 rw-p 00002000 08:02 424547     /usr/lib/libgpg-error.so.0.3.0
b2c05000-b2c07000 r-xp 00000000 08:02 1107970    /lib/i686/cmov/libutil-2.7.so
b2c07000-b2c09000 rw-p 00001000 08:02 1107970    /lib/i686/cmov/libutil-2.7.so
b2c09000-b2c0b000 r-xp 00000000 08:02 429009    
/usr/lib/libavahi-glib.so.1.0.1
b2c0b000-b2c0c000 rw-p 00002000 08:02 429009    
/usr/lib/libavahi-glib.so.1.0.1
b2c0c000-b2c20000 r-xp 00000000 08:02 423608    
/usr/lib/libgnome-2.so.0.1999.2
b2c20000-b2c21000 rw-p 00014000 08:02 423608    
/usr/lib/libgnome-2.so.0.1999.2
b2c21000-b2c22000 r--s 00000000 08:04 7897096   
/home/anonim1133/.local/share/mime/mime.cache
b2c22000-b2c2a000 r-xp 00000000 08:02 433758     /usr/lib/libfam.so.0.0.0
b2c2a000-b2c2b000 rw-p 00007000 08:02 433758     /usr/lib/libfam.so.0.0.0
b2c2b000-b2c31000 r-xp 00000000 08:02 1107942    /lib/libacl.so.1.1.0
b2c31000-b2c32000 rw-p 00005000 08:02 1107942    /lib/libacl.so.1.1.0
b2c32000-b2c3e000 r-xp 00000000 08:02 490037    
/usr/lib/gnome-vfs-2.0/modules/libfile.so
b2c3e000-b2c3f000 rw-p 0000b000 08:02 490037    
/usr/lib/gnome-vfs-2.0/modules/libfile.so
b2c3f000-b2c42000 r-xp 00000000 08:02 993751    
/usr/lib/jni/libswt-gnome-gtk-3448.so
b2c42000-b2c43000 rw-p 00002000 08:02 993751    
/usr/lib/jni/libswt-gnome-gtk-3448.so
b2c43000-b2c46000 ---p b2c43000 00:00 0 
b2c46000-b2c94000 rwxp b2c46000 00:00 0 
b2c94000-b2c97000 ---p b2c94000 00:00 0 
b2c97000-b2ce5000 rwxp b2c97000 00:00 0 
b2ce5000-b2d67000 rw-p b2ce5000 00:00 0 
b2d67000-b2dfc000 r--p 00000000 08:02 896275    
/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
b2dfc000-b2dfe000 r-xp 00000000 08:02 619077    
/usr/lib/pango/1.6.0/modules/pango-basic-fc.so
b2dfe000-b2dff000 rw-p 00001000 08:02 619077    
/usr/lib/pango/1.6.0/modules/pango-basic-fc.so
b2dff000-b2e05000 r--s 00000000 08:03 92537     
/var/cache/fontconfig/945677eb7aeaf62f1d50efc3fb3ec7d8-x86.cache-2
b2e05000-b2e0a000 r--s 00000000 08:03 92536     
/var/cache/fontconfig/e25ca923d7a08ab6b0777bd7eb77ea77-x86.cache-2
b2e0a000-b2e0b000 r--s 00000000 08:03 92535     
/var/cache/fontconfig/fd9505950c048a77dc4b710eb6a628ed-x86.cache-2
b2e0b000-b2e0e000 r--s 00000000 08:03 92534     
/var/cache/fontconfig/ddc79d3ea06a7c6ffa86ede85f3bb5df-x86.cache-2
b2e0e000-b2e0f000 r--s 00000000 08:03 92533     
/var/cache/fontconfig/e7071f4a29fa870f4323321c154eba04-x86.cache-2
b2e0f000-b2e10000 r--s 00000000 08:03 92532     
/var/cache/fontconfig/a2ab74764b07279e7c36ddb1d302cf26-x86.cache-2
b2e10000-b2e12000 r--s 00000000 08:03 92531     
/var/cache/fontconfig/c69f04ab05004e31a6d5e715764f16d8-x86.cache-2
b2e12000-b2e15000 r--s 00000000 08:03 92530     
/var/cache/fontconfig/6eb3985aa4124903f6ff08ba781cd364-x86.cache-2
b2e15000-b2e17000 r--s 00000000 08:03 92529     
/var/cache/fontconfig/646addb8444faa74ee138aa00ab0b6a0-x86.cache-2
b2e17000-b2e19000 r--s 00000000 08:03 92528     
/var/cache/fontconfig/20bd79ad97094406f7d1b9654bfbd926-x86.cache-2
b2e19000-b2e1c000 r--s 00000000 08:03 92527     
/var/cache/fontconfig/9c0624108b9a2ae8552f664125be8356-x86.cache-2
b2e1c000-b2e23000 r--s 00000000 08:03 92526     
/var/cache/fontconfig/6d41288fd70b0be22e8c3a91e032eec0-x86.cache-2
b2e23000-b2e26000 r--s 00000000 08:03 92525     
/var/cache/fontconfig/de156ccd2eddbdc19d37a45b8b2aac9c-x86.cache-2
b2e26000-b2e28000 r--s 00000000 08:03 92511     
/var/cache/fontconfig/da1bd5ca8443ffe22927a23ce431d198-x86.cache-2
b2e28000-b2e2a000 r--s 00000000 08:03 92510     
/var/cache/fontconfig/ddd4086aec35a5275babba44bb759c3c-x86.cache-2
b2e2a000-b2e2b000 r--s 00000000 08:03 92524     
/var/cache/fontconfig/4794a0821666d79190d59a36cb4f44b5-x86.cache-2
b2e2b000-b2e4d000 r--s 00000000 08:03 92509     
/var/cache/fontconfig/365b55f210c0a22e9a19e35191240f32-x86.cache-2
b2e4d000-b2e4f000 r--s 00000000 08:03 92523     
/var/cache/fontconfig/de9486f0b47a4d768a594cb4198cb1c6-x86.cache-2
b2e4f000-b2e56000 r--s 00000000 08:03 92522     
/var/cache/fontconfig/d52a8644073d54c13679302ca1180695-x86.cache-2
b2e56000-b2e59000 r--s 00000000 08:03 92520     
/var/cache/fontconfig/6386b86020ecc1ef9690bb720a13964f-x86.cache-2
b2e59000-b2e5f000 r--s 00000000 08:03 92508     
/var/cache/fontconfig/089dead882dea3570ffc31a9898cfb69-x86.cache-2
b2e5f000-b2e6f000 r--s 00000000 08:03 92517     
/var/cache/fontconfig/cabbd14511b9e8a55e92af97fb3a0461-x86.cache-2
b2e6f000-b2e76000 r--s 00000000 08:03 92515     
/var/cache/fontconfig/e13b20fdb08344e0e664864cc2ede53d-x86.cache-2
b2e76000-b2eb0000 r--s 00000000 08:03 92514     
/var/cache/fontconfig/eeebfc908bd29a90773fd860017aada4-x86.cache-2
b2eb0000-b2eea000 r--s 00000000 08:03 92513     
/var/cache/fontconfig/21a99156bb11811cef641abeda519a45-x86.cache-2
b2eea000-b2f4a000 rw-s 00000000 00:08 153157659  /SYSV00000000 (deleted)
b2f4a000-b2f4d000 ---p b2f4a000 00:00 0 
b2f4d000-b2f9b000 rwxp b2f4d000 00:00 0 
b2f9b000-b2f9e000 rwxp b2f9b000 00:00 0 
b2f9e000-b2fec000 rwxp b2f9e000 00:00 0 
b2fec000-b2fef000 rwxp b2fec000 00:00 0 
b2fef000-b303d000 rwxp b2fef000 00:00 0 
b303d000-b3040000 ---p b303d000 00:00 0 
b3040000-b308e000 rwxp b3040000 00:00 0 
b308e000-b30ee000 rw-s 00000000 00:08 153092121  /SYSV00000000 (deleted)
b30ee000-b30f1000 ---p b30ee000 00:00 0 
b30f1000-b313f000 rwxp b30f1000 00:00 0 
b313f000-b3142000 ---p b313f000 00:00 0 
b3142000-b3190000 rwxp b3142000 00:00 0 
b3190000-b3193000 rwxp b3190000 00:00 0 
b3193000-b31e1000 rwxp b3193000 00:00 0 
b31e1000-b31e4000 ---p b31e1000 00:00 0 
b31e4000-b3232000 rwxp b31e4000 00:00 0 
b3232000-b3235000 ---p b3232000 00:00 0 
b3235000-b3283000 rwxp b3235000 00:00 0 
b3283000-b3286000 ---p b3283000 00:00 0 
b3286000-b32d4000 rwxp b3286000 00:00 0 
b32d4000-b32d7000 ---p b32d4000 00:00 0 
b32d7000-b3325000 rwxp b32d7000 00:00 0 
b3325000-b3335000 r-xp 00000000 08:02 1107954   
/lib/i686/cmov/libresolv-2.7.so
b3335000-b3337000 rw-p 0000f000 08:02 1107954   
/lib/i686/cmov/libresolv-2.7.so
b3337000-b3339000 rw-p b3337000 00:00 0 
b3339000-b333d000 r-xp 00000000 08:02 1107921   
/lib/i686/cmov/libnss_dns-2.7.so
b333d000-b333f000 rw-p 00003000 08:02 1107921   
/lib/i686/cmov/libnss_dns-2.7.so
b333f000-b3340000 r--s 00000000 08:04 7897096   
/home/anonim1133/.local/share/mime/mime.cache
b3340000-b334b000 r-xp 00000000 08:02 993747    
/usr/lib/jni/libswt-cairo-gtk-3448.so
b334b000-b334c000 rw-p 0000a000 08:02 993747    
/usr/lib/jni/libswt-cairo-gtk-3448.so
b334c000-b3352000 r-xp 00000000 08:02 993653    
/usr/lib/jni/libswt-atk-gtk-3448.so
b3352000-b3353000 rw-p 00005000 08:02 993653    
/usr/lib/jni/libswt-atk-gtk-3448.so
b3353000-b3356000 r--s 00000000 08:03 92596     
/var/cache/fontconfig/7ef2298fde41cc6eeb7af42e48b7d293-x86.cache-2
b3356000-b3359000 rw-s 00000000 00:08 153124890  /SYSV00000000 (deleted)
b3359000-b335b000 r-xp 00000000 08:02 436140     /usr/lib/gconv/ISO8859-2.so
b335b000-b335d000 rw-p 00001000 08:02 436140     /usr/lib/gconv/ISO8859-2.so
b335d000-b3360000 ---p b335d000 00:00 0 
b3360000-b33ae000 rwxp b3360000 00:00 0 
b33ae000-b33b1000 ---p b33ae000 00:00 0 
b33b1000-b33ff000 rwxp b33b1000 00:00 0 
b33ff000-b3402000 ---p b33ff000 00:00 0 
b3402000-b3450000 rwxp b3402000 00:00 0 
b3450000-b3453000 ---p b3450000 00:00 0 
b3453000-b34a1000 rwxp b3453000 00:00 0 
b34a1000-b34a4000 ---p b34a1000 00:00 0 
b34a4000-b34f2000 rwxp b34a4000 00:00 0 
b34f2000-b3500000 r--s 0035f000 08:02 1256386   
/usr/lib/jvm/java-6-openjdk/jre/lib/charsets.jar
b3500000-b3600000 rw-p b3500000 00:00 0 
b3600000-b3602000 r-xp 00000000 08:02 1107852    /lib/libnss_mdns4_minimal.so.2
b3602000-b3603000 rw-p 00001000 08:02 1107852    /lib/libnss_mdns4_minimal.so.2
b3603000-b3606000 ---p b3603000 00:00 0 
b3606000-b3654000 rwxp b3606000 00:00 0 
b3654000-b3657000 ---p b3654000 00:00 0 
b3657000-b36a5000 rwxp b3657000 00:00 0 
b36a5000-b36a8000 ---p b36a5000 00:00 0 
b36a8000-b36f6000 rwxp b36a8000 00:00 0 
b36f6000-b36f9000 ---p b36f6000 00:00 0 
b36f9000-b3747000 rwxp b36f9000 00:00 0 
b3747000-b3767000 r--p 00000000 08:02 427375    
/usr/share/locale/pl/LC_MESSAGES/libc.mo
b3767000-b376f000 r-xp 00000000 08:02 619244    
/usr/lib/gtk-2.0/2.10.0/engines/libxfce.so
b376f000-b3770000 rw-p 00008000 08:02 619244    
/usr/lib/gtk-2.0/2.10.0/engines/libxfce.so
b3770000-b3794000 r--p 00000000 08:02 787791    
/usr/share/locale/pl/LC_MESSAGES/gtk20-properties.mo
b3794000-b3798000 r-xp 00000000 08:02 433010     /usr/lib/libXdmcp.so.6.0.0
b3798000-b3799000 rw-p 00003000 08:02 433010     /usr/lib/libXdmcp.so.6.0.0
b3799000-b37bd000 r-xp 00000000 08:02 425684     /usr/lib/libexpat.so.1.5.2
b37bd000-b37bf000 rw-p 00023000 08:02 425684     /usr/lib/libexpat.so.1.5.2
b37bf000-b37c1000 r-xp 00000000 08:02 433007     /usr/lib/libXau.so.6.0.0
b37c1000-b37c2000 rw-p 00001000 08:02 433007     /usr/lib/libXau.so.6.0.0
b37c2000-b37ea000 r-xp 00000000 08:02 426477     /usr/lib/libpixman-1.so.0.10.0
b37ea000-b37eb000 rw-p 00027000 08:02 426477     /usr/lib/libpixman-1.so.0.10.0
b37eb000-b37f1000 r-xp 00000000 08:02 2557814   
/usr/lib/libxcb-render.so.0.0.0
b37f1000-b37f2000 rw-p 00005000 08:02 2557814   
/usr/lib/libxcb-render.so.0.0.0
b37f2000-b37f5000 r-xp 00000000 08:02 436227    
/usr/lib/libxcb-render-util.so.0.0.0
b37f5000-b37f6000 rw-p 00002000 08:02 436227    
/usr/lib/libxcb-render-util.so.0.0.0
b37f6000-b3819000 r-xp 00000000 08:02 427918     /usr/lib/libpng12.so.0.27.0
b3819000-b381a000 rw-p 00022000 08:02 427918     /usr/lib/libpng12.so.0.27.0
b381a000-b382d000 r-xp 00000000 08:02 423717    
/usr/lib/libdirect-1.0.so.0.1.0
b382d000-b382e000 rw-p 00012000 08:02 423717    
/usr/lib/libdirect-1.0.so.0.1.0
b382e000-b3835000 r-xp 00000000 08:02 428208    
/usr/lib/libfusion-1.0.so.0.1.0
b3835000-b3836000 rw-p 00006000 08:02 428208    
/usr/lib/libfusion-1.0.so.0.1.0
b3836000-b389b000 r-xp 00000000 08:02 428207    
/usr/lib/libdirectfb-1.0.so.0.1.0
b389b000-b389d000 rw-p 00065000 08:02 428207    
/usr/lib/libdirectfb-1.0.so.0.1.0
b389d000-b38cb000 r-xp 00000000 08:02 424147     /usr/lib/libpcre.so.3.12.1
b38cb000-b38cc000 rw-p 0002d000 08:02 424147     /usr/lib/libpcre.so.3.12.1
b38cc000-b38e3000 r-xp 00000000 08:02 428302     /usr/lib/libxcb.so.1.0.0
b38e3000-b38e4000 rw-p 00016000 08:02 428302     /usr/lib/libxcb.so.1.0.0
b38e4000-b38e5000 r-xp 00000000 08:02 439620     /usr/lib/libxcb-xlib.so.0.0.0
b38e5000-b38e6000 rw-p 00000000 08:02 439620     /usr/lib/libxcb-xlib.so.0.0.0
b38e6000-b3957000 r-xp 00000000 08:02 2557357    /usr/lib/libfreetype.so.6.3.18
b3957000-b395b000 rw-p 00070000 08:02 2557357    /usr/lib/libfreetype.so.6.3.18
b395b000-b3981000 r-xp 00000000 08:02 2557819   
/usr/lib/libpangoft2-1.0.so.0.2002.3
b3981000-b3982000 rw-p 00026000 08:02 2557819   
/usr/lib/libpangoft2-1.0.so.0.2002.3
b3982000-b398a000 r-xp 00000000 08:02 426413     /usr/lib/libXcursor.so.1.0.2
b398a000-b398b000 rw-p 00007000 08:02 426413     /usr/lib/libXcursor.so.1.0.2
b398b000-b3990000 r-xp 00000000 08:02 2557851    /usr/lib/libXrandr.so.2.1.0
b3990000-b3991000 rw-p 00005000 08:02 2557851    /usr/lib/libXrandr.so.2.1.0
b3991000-b3998000 r-xp 00000000 08:02 426473     /usr/lib/libXi.so.6.0.0
b3998000-b3999000 rw-p 00006000 08:02 426473     /usr/lib/libXi.so.6.0.0
b3999000-b399b000 r-xp 00000000 08:02 2557826    /usr/lib/libXinerama.so.1.0.0
b399b000-b399c000 rw-p 00001000 08:02 2557826    /usr/lib/libXinerama.so.1.0.0
b399c000-b39a4000 r-xp 00000000 08:02 2557561    /usr/lib/libXrender.so.1.3.0
b39a4000-b39a5000 rw-p 00007000 08:02 2557561    /usr/lib/libXrender.so.1.3.0
b39a5000-b39ce000 r-xp 00000000 08:02 2557552   
/usr/lib/libfontconfig.so.1.3.0
b39ce000-b39cf000 rw-p 00029000 08:02 2557552   
/usr/lib/libfontconfig.so.1.3.0
b39cf000-b39dc000 r-xp 00000000 08:02 428173     /usr/lib/libXext.so.6.4.0
b39dc000-b39dd000 rw-p 0000c000 08:02 428173     /usr/lib/libXext.so.6.4.0
b39dd000-b3a47000 r-xp 00000000 08:02 2557635    /usr/lib/libcairo.so.2.17.5
b3a47000-b3a49000 rw-p 0006a000 08:02 2557635    /usr/lib/libcairo.so.2.17.5
b3a49000-b3afd000 r-xp 00000000 08:02 430849    
/usr/lib/libglib-2.0.so.0.1600.6
b3afd000-b3afe000 rw-p 000b3000 08:02 430849    
/usr/lib/libglib-2.0.so.0.1600.6
b3afe000-b3b01000 r-xp 00000000 08:02 432236    
/usr/lib/libgmodule-2.0.so.0.1600.6
b3b01000-b3b02000 rw-p 00002000 08:02 432236    
/usr/lib/libgmodule-2.0.so.0.1600.6
b3b02000-b3b3c000 r-xp 00000000 08:02 431624    
/usr/lib/libgobject-2.0.so.0.1600.6
b3b3c000-b3b3d000 rw-p 0003a000 08:02 431624    
/usr/lib/libgobject-2.0.so.0.1600.6
b3b3d000-b3b56000 r-xp 00000000 08:02 437328    
/usr/lib/libatk-1.0.so.0.2209.1
b3b56000-b3b58000 rw-p 00018000 08:02 437328    
/usr/lib/libatk-1.0.so.0.2209.1
b3b58000-b3b5c000 r-xp 00000000 08:02 424664     /usr/lib/libXfixes.so.3.1.0
b3b5c000-b3b5d000 rw-p 00003000 08:02 424664     /usr/lib/libXfixes.so.3.1.0
b3b5d000-b3c48000 r-xp 00000000 08:02 438792     /usr/lib/libX11.so.6.2.0
b3c48000-b3c4c000 rw-p 000ea000 08:02 438792     /usr/lib/libX11.so.6.2.0
b3c4c000-b3c8a000 r-xp 00000000 08:02 428024    
/usr/lib/libpango-1.0.so.0.2002.3
b3c8a000-b3c8c000 rw-p 0003d000 08:02 428024    
/usr/lib/libpango-1.0.so.0.2002.3
b3c8c000-b3d10000 r-xp 00000000 08:02 431307    
/usr/lib/libgdk-x11-2.0.so.0.1200.11
b3d10000-b3d13000 rw-p 00083000 08:02 431307    
/usr/lib/libgdk-x11-2.0.so.0.1200.11
b3d13000-b3d2a000 r-xp 00000000 08:02 431308    
/usr/lib/libgdk_pixbuf-2.0.so.0.1200.11
b3d2a000-b3d2b000 rw-p 00017000 08:02 431308    
/usr/lib/libgdk_pixbuf-2.0.so.0.1200.11
b3d2b000-b40af000 r-xp 00000000 08:02 2557886   
/usr/lib/libgtk-x11-2.0.so.0.1200.11
b40af000-b40b5000 rw-p 00383000 08:02 2557886   
/usr/lib/libgtk-x11-2.0.so.0.1200.11
b40b5000-b40b6000 rw-p b40b5000 00:00 0 
b40b6000-b4117000 r-xp 00000000 08:02 993739    
/usr/lib/jni/libswt-pi-gtk-3448.so
b4117000-b4119000 rw-p 00060000 08:02 993739    
/usr/lib/jni/libswt-pi-gtk-3448.so
b4119000-b411a000 rw-p b4119000 00:00 0 
b411a000-b411d000 rwxp b411a000 00:00 0 
b411d000-b416b000 rwxp b411d000 00:00 0 
b416b000-b416e000 rwxp b416b000 00:00 0 
b416e000-b41bc000 rwxp b416e000 00:00 0 
b41bc000-b41bf000 ---p b41bc000 00:00 0 
b41bf000-b420d000 rwxp b41bf000 00:00 0 
b420d000-b4210000 ---p b420d000 00:00 0 
b4210000-b425e000 rwxp b4210000 00:00 0 
b425e000-b4261000 ---p b425e000 00:00 0 
b4261000-b42af000 rwxp b4261000 00:00 0 
b42af000-b42b2000 ---p b42af000 00:00 0 
b42b2000-b4300000 rwxp b42b2000 00:00 0 
b4300000-b43fe000 rw-p b4300000 00:00 0 
b43fe000-b4400000 ---p b43fe000 00:00 0 
b4400000-b4402000 r-xp 00000000 08:02 2557854    /usr/lib/libXdamage.so.1.1.0
b4402000-b4403000 rw-p 00001000 08:02 2557854    /usr/lib/libXdamage.so.1.1.0
b4403000-b440c000 r-xp 00000000 08:02 2557818   
/usr/lib/libpangocairo-1.0.so.0.2002.3
b440c000-b440d000 rw-p 00008000 08:02 2557818   
/usr/lib/libpangocairo-1.0.so.0.2002.3
b440d000-b4410000 ---p b440d000 00:00 0 
b4410000-b445e000 rwxp b4410000 00:00 0 
b445e000-b4461000 ---p b445e000 00:00 0 
b4461000-b44af000 rwxp b4461000 00:00 0 
b44af000-b44b2000 ---p b44af000 00:00 0 
b44b2000-b4500000 rwxp b44b2000 00:00 0 
b4500000-b4600000 rw-p b4500000 00:00 0 
b4600000-b4601000 r--s 00000000 08:03 92275     
/var/cache/fontconfig/c855463f699352c367813e37f3f70ea7-x86.cache-2
b4601000-b4603000 r-xp 00000000 08:02 423756    
/usr/lib/libXcomposite.so.1.0.0
b4603000-b4604000 rw-p 00001000 08:02 423756    
/usr/lib/libXcomposite.so.1.0.0
b4604000-b4608000 r-xp 00000000 08:02 428155     /usr/lib/libXtst.so.6.1.0
b4608000-b4609000 rw-p 00003000 08:02 428155     /usr/lib/libXtst.so.6.1.0
b4609000-b460d000 r-xp 00000000 08:02 431626    
/usr/lib/libgthread-2.0.so.0.1600.6
b460d000-b460e000 rw-p 00003000 08:02 431626    
/usr/lib/libgthread-2.0.so.0.1600.6
b460e000-b460f000 r--s 00000000 08:03 92269     
/var/cache/fontconfig/3830d5c3ddfd5cd38a049b759396e72e-x86.cache-2
b460f000-b4611000 r--s 00006000 08:04 2768901   
/home/anonim1133/.azureus/plugins/progressbar/progressbar_0.2.2.jar
b4611000-b4615000 rwxp b4611000 00:00 0 
b4615000-b461c000 r--s 00000000 08:02 429939    
/usr/lib/gconv/gconv-modules.cache
b461c000-b462c000 r--p 00000000 08:02 787790    
/usr/share/locale/pl/LC_MESSAGES/gtk20.mo
b462c000-b462f000 r-xp 00000000 08:02 993738    
/usr/lib/jni/libswt-gtk-3448.so
b462f000-b4630000 rw-p 00003000 08:02 993738    
/usr/lib/jni/libswt-gtk-3448.so
b4630000-b4631000 rw-p b4630000 00:00 0 
b4631000-b4634000 r--s 00014000 08:02 1256390   
/usr/lib/jvm/java-6-openjdk/jre/lib/jce.jar
b4634000-b4637000 ---p b4634000 00:00 0 
b4637000-b4685000 rwxp b4637000 00:00 0 
b4685000-b4688000 ---p b4685000 00:00 0 
b4688000-b46d6000 rwxp b4688000 00:00 0 
b46d6000-b46d9000 ---p b46d6000 00:00 0 
b46d9000-b4727000 rwxp b46d9000 00:00 0 
b4727000-b472a000 ---p b4727000 00:00 0 
b472a000-b4778000 rwxp b472a000 00:00 0 
b4778000-b478c000 r-xp 00000000 08:02 1256450   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libnet.so
b478c000-b478d000 rw-p 00013000 08:02 1256450   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libnet.so
b478d000-b479f000 r--s 00146000 08:02 619115    
/usr/share/java/swt-gtk-3.4.jar
b479f000-b47a2000 rwxp b479f000 00:00 0 
b47a2000-b47f0000 rwxp b47a2000 00:00 0 
b47f0000-b48ad000 r--s 00a5a000 08:02 619996     /usr/share/java/Azureus2.jar
b48ad000-b48ae000 ---p b48ad000 00:00 0 
b48ae000-b492e000 rwxp b48ae000 00:00 0 
b492e000-b4931000 ---p b492e000 00:00 0 
b4931000-b497f000 rwxp b4931000 00:00 0 
b497f000-b4982000 ---p b497f000 00:00 0 
b4982000-b4a00000 rwxp b4982000 00:00 0 
b4a00000-b4af9000 rw-p b4a00000 00:00 0 
b4af9000-b4b00000 ---p b4af9000 00:00 0 
b4b00000-b4b07000 r-xp 00000000 08:02 1256476   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libnio.so
b4b07000-b4b08000 rw-p 00006000 08:02 1256476   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libnio.so
b4b08000-b4b0c000 r--s 00030000 08:02 1256406   
/usr/lib/jvm/java-6-openjdk/jre/lib/ext/sunjce_provider.jar
b4b0c000-b4b10000 r--s 00079000 08:02 1256407   
/usr/lib/jvm/java-6-openjdk/jre/lib/jsse.jar
b4b10000-b4b22000 r--s 00146000 08:02 619115    
/usr/share/java/swt-gtk-3.4.jar
b4b22000-b4b2a000 r--s 0004b000 08:02 619501    
/usr/share/java/log4j-1.2.15.jar
b4b2a000-b4b33000 r--s 00065000 08:02 619102    
/usr/share/java/gnome-java-bridge.jar
b4b33000-b4b36000 ---p b4b33000 00:00 0 
b4b36000-b4b84000 rwxp b4b36000 00:00 0 
b4b84000-b4cf9000 r--p 00000000 08:02 439846     /usr/lib/locale/locale-archive
b4cf9000-b4cfc000 ---p b4cf9000 00:00 0 
b4cfc000-b4d4a000 rwxp b4cfc000 00:00 0 
b4d4a000-b4d4d000 ---p b4d4a000 00:00 0 
b4d4d000-b4d9b000 rwxp b4d4d000 00:00 0 
b4d9b000-b4d9c000 ---p b4d9b000 00:00 0 
b4d9c000-b4e1c000 rwxp b4d9c000 00:00 0 
b4e1c000-b4e4e000 rw-p b4e1c000 00:00 0 
b4e4e000-b4fdd000 r--s 033ba000 08:02 1256478   
/usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar
b4fdd000-b4ff2000 rwxp b4fdd000 00:00 0 
b4ff2000-b500a000 rwxp b4ff2000 00:00 0 
b500a000-b5019000 rwxp b500a000 00:00 0 
b5019000-b51e3000 rwxp b5019000 00:00 0 
b51e3000-b51e5000 rwxp b51e3000 00:00 0 
b51e5000-b520a000 rwxp b51e5000 00:00 0 
b520a000-b5219000 rwxp b520a000 00:00 0 
b5219000-b53e3000 rwxp b5219000 00:00 0 
b53e3000-b53ec000 rwxp b53e3000 00:00 0 
b53ec000-b5403000 rwxp b53ec000 00:00 0 
b5403000-b5434000 rwxp b5403000 00:00 0 
b5434000-b548e000 rwxp b5434000 00:00 0 
b548e000-b5dfe000 rwxp b548e000 00:00 0 
b5dfe000-b748e000 rwxp b5dfe000 00:00 0 
b748e000-b74b2000 r-xp 00000000 08:02 1256462   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libjava.so
b74b2000-b74b4000 rw-p 00023000 08:02 1256462   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libjava.so
b74b4000-b74be000 r-xp 00000000 08:02 1107929   
/lib/i686/cmov/libnss_files-2.7.so
b74be000-b74c0000 rw-p 00009000 08:02 1107929   
/lib/i686/cmov/libnss_files-2.7.so
b74c0000-b74d5000 r-xp 00000000 08:02 1107917    /lib/i686/cmov/libnsl-2.7.so
b74d5000-b74d7000 rw-p 00014000 08:02 1107917    /lib/i686/cmov/libnsl-2.7.so
b74d7000-b74d9000 rw-p b74d7000 00:00 0 
b74d9000-b74da000 r--s 00007000 08:02 619394    
/usr/share/java/commons-cli-1.1.jar
b74da000-b74e1000 r-xp 00000000 08:02 1256458   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libzip.so
b74e1000-b74e2000 rw-p 00006000 08:02 1256458   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libzip.so
b74e2000-b74ee000 r-xp 00000000 08:02 1256449   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libverify.so
b74ee000-b74ef000 rw-p 0000c000 08:02 1256449   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/libverify.so
b74ef000-b74f7000 rw-s 00000000 08:02 1340726   
/tmp/hsperfdata_anonim1133/6541
b74f7000-b74fe000 r-xp 00000000 08:02 1107956    /lib/i686/cmov/librt-2.7.so
b74fe000-b7500000 rw-p 00006000 08:02 1107956    /lib/i686/cmov/librt-2.7.so
b7500000-b7503000 ---p b7500000 00:00 0 
b7503000-b7551000 rwxp b7503000 00:00 0 
b7551000-b7575000 r-xp 00000000 08:02 1107911    /lib/i686/cmov/libm-2.7.so
b7575000-b7577000 rw-p 00023000 08:02 1107911    /lib/i686/cmov/libm-2.7.so
b7577000-b792e000 r-xp 00000000 08:02 1288049   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/libjvm.so
b792e000-b794d000 rw-p 003b6000 08:02 1288049   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/libjvm.so
b794d000-b7d6c000 rw-p b794d000 00:00 0 
b7d6c000-b7ec1000 r-xp 00000000 08:02 1107846    /lib/i686/cmov/libc-2.7.so
b7ec1000-b7ec2000 r--p 00155000 08:02 1107846    /lib/i686/cmov/libc-2.7.so
b7ec2000-b7ec4000 rw-p 00156000 08:02 1107846    /lib/i686/cmov/libc-2.7.so
b7ec4000-b7ec7000 rw-p b7ec4000 00:00 0 
b7ec7000-b7ec9000 r-xp 00000000 08:02 1107909    /lib/i686/cmov/libdl-2.7.so
b7ec9000-b7ecb000 rw-p 00001000 08:02 1107909    /lib/i686/cmov/libdl-2.7.so
b7ecb000-b7ece000 r-xp 00000000 08:02 1256453   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/jli/libjli.so
b7ece000-b7ecf000 rw-p 00003000 08:02 1256453   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/jli/libjli.so
b7ecf000-b7ee4000 r-xp 00000000 08:02 1107949   
/lib/i686/cmov/libpthread-2.7.so
b7ee4000-b7ee6000 rw-p 00014000 08:02 1107949   
/lib/i686/cmov/libpthread-2.7.so
b7ee6000-b7ee9000 rw-p b7ee6000 00:00 0 
b7ee9000-b7efd000 r-xp 00000000 08:02 425106     /usr/lib/libz.so.1.2.3.3
b7efd000-b7efe000 rw-p 00013000 08:02 425106     /usr/lib/libz.so.1.2.3.3
b7efe000-b7f07000 r-xp 00000000 08:02 1107939   
/lib/i686/cmov/libnss_nis-2.7.so
b7f07000-b7f09000 rw-p 00008000 08:02 1107939   
/lib/i686/cmov/libnss_nis-2.7.so
b7f09000-b7f10000 r-xp 00000000 08:02 1107919   
/lib/i686/cmov/libnss_compat-2.7.so
b7f10000-b7f12000 rw-p 00006000 08:02 1107919   
/lib/i686/cmov/libnss_compat-2.7.so
b7f12000-b7f19000 r-xp 00000000 08:02 1303134   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads/libhpi.so
b7f19000-b7f1a000 rw-p 00006000 08:02 1303134   
/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads/libhpi.so
b7f1a000-b7f1b000 rwxp b7f1a000 00:00 0 
b7f1b000-b7f1c000 r--p b7f1b000 00:00 0 
b7f1c000-b7f1e000 rw-p b7f1c000 00:00 0 
b7f1e000-b7f1f000 r-xp b7f1e000 00:00 0          [vdso]
b7f1f000-b7f39000 r-xp 00000000 08:02 1107591    /lib/ld-2.7.so
b7f39000-b7f3b000 rw-p 0001a000 08:02 1107591    /lib/ld-2.7.so
bf925000-bf938000 rwxp bffeb000 00:00 0          [stack]
bf938000-bf93a000 rw-p bfffe000 00:00 0 

VM Arguments:
jvm_args: -Xmx1024M -Djava.library.path=/usr/lib/jni:/usr/lib
-Dazureus.install.path=/home/anonim1133/.azureus 
java_command: org.gudy.azureus2.ui.common.Main
Launcher Type: SUN_STANDARD

Environment Variables:
PATH=/usr/local/bin:/usr/bin:/bin:/usr/games
USERNAME=anonim1133
LD_LIBRARY_PATH=/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/../lib/i386
SHELL=/bin/bash
DISPLAY=:0.0

Signal Handlers:
SIGSEGV: [libjvm.so+0x360500], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGBUS: [libjvm.so+0x360500], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGFPE: [libjvm.so+0x292270], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGPIPE: SIG_IGN, sa_mask[0]=0x00000000, sa_flags=0x00000000
SIGXFSZ: [libjvm.so+0x292270], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGILL: [libjvm.so+0x292270], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
SIGUSR2: [libjvm.so+0x291b20], sa_mask[0]=0x00000000, sa_flags=0x10000004
SIGHUP: [libjvm.so+0x294060], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGINT: [libjvm.so+0x294060], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGTERM: [libjvm.so+0x294060], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGQUIT: [libjvm.so+0x294060], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004


---------------  S Y S T E M  ---------------

OS:lenny/sid

uname:Linux 2.6.26-1-686 #1 SMP Sat Oct 18 16:22:25 UTC 2008 i686
libc:glibc 2.7 NPTL 2.7 
rlimit: STACK 8192k, CORE 0k, NPROC 8190, NOFILE 1024, AS infinity
load average:0,12 0,05 0,05

CPU:total 2 (2 cores per cpu, 1 threads per core) family 6 model 15 stepping 2,
cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3

Memory: 4k page, physical 1035824k(19884k free), swap 0k(0k free)

vm_info: OpenJDK Client VM (1.6.0_0-b11) for linux-x86 JRE (1.6.0_0-b11), built
on Oct  6 2008 09:12:47 by "doko" with gcc 4.3.2

time: Sat Nov 15 07:31:54 2008
elapsed time: 37936 seconds


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From gnu_andrew at member.fsf.org  Wed Nov 19 17:59:07 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 20 Nov 2008 01:59:07 +0000
Subject: changeset in /hg/icedtea: Remove gcjwebplugin.
Message-ID: <hg.c5f13156e70a.1227146347.-6899778133799504387@icedtea.classpath.org>

changeset c5f13156e70a in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c5f13156e70a
description:
	Remove gcjwebplugin.

	2008-11-20  Andrew John Hughes  <ahughes at redhat.com>

		PR icedtea/236:
		* gcjwebplugin.cc,
		* Makefile.am,
		* configure.ac:
		Remove gcjwebplugin.

diffstat:

4 files changed, 15 insertions(+), 1723 deletions(-)
ChangeLog       |    8 
Makefile.am     |   61 --
configure.ac    |    8 
gcjwebplugin.cc | 1661 -------------------------------------------------------

diffs (truncated from 1844 to 500 lines):

diff -r 1ae3ef81f9b2 -r c5f13156e70a ChangeLog
--- a/ChangeLog	Thu Nov 20 00:41:27 2008 +0000
+++ b/ChangeLog	Thu Nov 20 01:58:47 2008 +0000
@@ -1,3 +1,11 @@ 2008-09-04  C. K. Jester-Young  <cky944@
+2008-11-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/236:
+	* gcjwebplugin.cc,
+	* Makefile.am,
+	* configure.ac:
+	Remove gcjwebplugin.
+
 2008-09-04  C. K. Jester-Young  <cky944 at gmail.com>
 
 	* Makefile.am,
diff -r 1ae3ef81f9b2 -r c5f13156e70a Makefile.am
--- a/Makefile.am	Thu Nov 20 00:41:27 2008 +0000
+++ b/Makefile.am	Thu Nov 20 01:58:47 2008 +0000
@@ -9,12 +9,6 @@ NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6
 NETBEANS_PROFILER_MD5SUM = ff8e8abc42df6c6749e6b02bcf7bb0a5
 VISUALVM_MD5SUM = 4b55bc623418818793392bb233da2927
 
-if ENABLE_GCJWEBPLUGIN
-GCJWEBPLUGIN_CLEAN = clean-gcjwebplugin
-GCJWEBPLUGIN_TARGET = gcjwebplugin.so
-else
-GCJWEBPLUGIN_CLEAN =
-GCJWEBPLUGIN_TARGET =
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
 ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
@@ -25,7 +19,6 @@ ICEDTEAPLUGIN_TARGET =
 ICEDTEAPLUGIN_TARGET =
 PLUGIN_PATCH = patches/icedtea-plugin.patch
 LIVECONNECT_DIR =
-endif
 endif
 
 if ENABLE_PULSE_JAVA
@@ -68,10 +61,6 @@ distclean-local: clean-copy clean-jtreg 
 	rm -rf rt/netscape
 if ENABLE_PLUGIN
 	rm -f IcedTeaPlugin.o IcedTeaPlugin.so
-else
-if ENABLE_GCJWEBPLUGIN
-	rm -f gcjwebplugin.so
-endif
 endif
 	rm -rf cacao
 	rm -rf visualvm
@@ -93,9 +82,9 @@ install:
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
 	clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
 	clean-tools-jar clean-shared-objects \
-	clean-copy clean-hotspot-tools clean-rt $(GCJWEBPLUGIN_CLEAN) \
-	$(ICEDTEAPLUGIN_CLEAN) hotspot hotspot-helper clean-extra \
-	clean-jtreg clean-jtreg-reports clean-visualvm clean-nbplatform
+	clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+	hotspot hotspot-helper clean-extra clean-jtreg clean-jtreg-reports \
+	clean-visualvm clean-nbplatform
 
 GENERATED_FILES = generated/com/sun/java/swing/plaf/gtk/resources/gtk_it.java \
 	generated/com/sun/java/swing/plaf/gtk/resources/gtk_de.java \
@@ -1352,8 +1341,7 @@ PULSEAUDIO_SOURCES = $(top_srcdir)/pulse
 	$(top_srcdir)/pulseaudio/COPYING
 
 EXTRA_DIST = $(GENERATED_FILES) $(top_srcdir)/patches/icedtea-*.patch \
-	gcjwebplugin.cc tools-copy contrib ports \
-	extra overlays \
+	tools-copy contrib ports extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
 	jconsole.desktop policytool.desktop \
 	$(JTREG_SOURCES) \
@@ -2351,25 +2339,17 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
-	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp
+	$(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/visualvm.stamp stamps/pulse-java.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_BUILD_TARGET)
-if ENABLE_GCJWEBPLUGIN
-	cp -pPRf gcjwebplugin.so \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf gcjwebplugin.so \
-	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-else
 if ENABLE_PLUGIN
 	cp -pPRf IcedTeaPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -pPRf IcedTeaPlugin.so \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
-endif
 endif
 if ENABLE_PULSE_JAVA
 	cp -pPRf libpulse-java.so \
@@ -2414,25 +2394,17 @@ stamps/icedtea-debug.stamp: stamps/boots
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(GCJWEBPLUGIN_TARGET) $(ICEDTEAPLUGIN_TARGET) \
-	extra-lib/about.jar stamps/cacao.stamp \
+	$(ICEDTEAPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
 	stamps/pulse-java.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/ \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
-if ENABLE_GCJWEBPLUGIN
-	cp -pPRf gcjwebplugin.so \
-	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf gcjwebplugin.so \
-	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-else
 if ENABLE_PLUGIN
 	cp -pPRf IcedTeaPlugin.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
 	cp -pPRf IcedTeaPlugin.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
-endif
 endif
 if ENABLE_PULSE_JAVA
 	cp -pPRf libpulse-java.so \
@@ -2792,24 +2764,6 @@ clean-cacao:
 	rm -rf cacao
 	rm -f stamps/cacao.stamp
 
-if ENABLE_GCJWEBPLUGIN
-# gcjwebplugin.so.
-gcjwebplugin.so: gcjwebplugin.cc
-	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
-	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
-	fi ; \
-	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
-	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
-	$(CXX) $(CXXFLAGS) $(MOZILLA_CFLAGS) \
-	  $(MOZILLA_LIBS) $(GLIB_CFLAGS) $(GLIB_LIBS) \
-	  $(GTK_CFLAGS) $(GTK_LIBS) \
-	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
-	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
-	  -fPIC -shared -o $@ $<
-
-clean-gcjwebplugin:
-	rm -f gcjwebplugin.so
-else
 if ENABLE_PLUGIN
 # IcedTeaPlugin.so.
 # Separate compile and link invocations to ensure intermediate object
@@ -2837,7 +2791,6 @@ clean-IcedTeaPlugin:
 clean-IcedTeaPlugin:
 	rm -f IcedTeaPlugin.o
 	rm -f IcedTeaPlugin.so
-endif
 endif
 
 
diff -r 1ae3ef81f9b2 -r c5f13156e70a configure.ac
--- a/configure.ac	Thu Nov 20 00:41:27 2008 +0000
+++ b/configure.ac	Thu Nov 20 01:58:47 2008 +0000
@@ -135,14 +135,6 @@ AC_ARG_ENABLE([liveconnect],
               [enable_plugin="${enableval}"], [enable_plugin="yes"])
 AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
 AC_MSG_RESULT(${enable_plugin})
-
-AC_MSG_CHECKING([whether to build gcjwebplugin])
-AC_ARG_ENABLE([gcjwebplugin],
-              [AS_HELP_STRING([--enable-gcjwebplugin],
-                              [Build the GCJ Web Plugin plugin (deprecated)])],
-              [enable_gcjwebplugin="${enableval}"], [enable_gcjwebplugin="no"])
-AM_CONDITIONAL(ENABLE_GCJWEBPLUGIN, test "x${enable_gcjwebplugin}" = "xyes")
-AC_MSG_RESULT(${enable_gcjwebplugin})
 
 AC_MSG_CHECKING([whether to include PulseAudio support])
 AC_ARG_ENABLE([pulse-java],
diff -r 1ae3ef81f9b2 -r c5f13156e70a gcjwebplugin.cc
--- a/gcjwebplugin.cc	Thu Nov 20 00:41:27 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1661 +0,0 @@
-/* gcjwebplugin.cc -- web browser plugin to execute Java applets
-   Copyright (C) 2003, 2004, 2006, 2007  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath 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 GNU Classpath; 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. */
-
-// System includes.
-#include <dlfcn.h>
-#include <errno.h>
-#include <libgen.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-// Netscape plugin API includes.
-#include <npapi.h>
-#include <npupp.h>
-
-// GLib includes.
-#include <glib.h>
-#include <glib/gstdio.h>
-
-// GTK includes.
-#include <gtk/gtk.h>
-
-// Documentbase retrieval includes.
-#include <nsIPluginInstance.h>
-#include <nsIPluginInstancePeer.h>
-#include <nsIPluginTagInfo2.h>
-
-// Debugging macros.
-#define PLUGIN_DEBUG(message)                                           \
-  g_print ("GCJ PLUGIN: thread %p: %s\n", g_thread_self (), message)
-
-#define PLUGIN_DEBUG_TWO(first, second)                                 \
-  g_print ("GCJ PLUGIN: thread %p: %s %s\n", g_thread_self (),          \
-           first, second)
-
-// Error reporting macros.
-#define PLUGIN_ERROR(message)                                       \
-  g_printerr ("%s:%d: thread %p: Error: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), message)
-
-#define PLUGIN_ERROR_TWO(first, second)                                 \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s\n", __FILE__, __LINE__,  \
-              g_thread_self (), first, second)
-
-#define PLUGIN_ERROR_THREE(first, second, third)                        \
-  g_printerr ("%s:%d: thread %p: Error: %s: %s: %s\n", __FILE__,        \
-              __LINE__, g_thread_self (), first, second, third)
-
-// Plugin information passed to about:plugins.
-#define PLUGIN_NAME "GCJ Web Browser Plugin (using IcedTea)"
-#define PLUGIN_DESC "The " PLUGIN_NAME PLUGIN_VERSION " executes Java applets."
-#define PLUGIN_MIME_DESC                                               \
-  "application/x-java-vm:class,jar:IcedTea;"                           \
-  "application/x-java-applet:class,jar:IcedTea;"                       \
-  "application/x-java-applet;version=1.1:class,jar:IcedTea;"           \
-  "application/x-java-applet;version=1.1.1:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.1.2:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.1.3:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.2:class,jar:IcedTea;"           \
-  "application/x-java-applet;version=1.2.1:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.2.2:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.3:class,jar:IcedTea;"           \
-  "application/x-java-applet;version=1.3.1:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.4:class,jar:IcedTea;"           \
-  "application/x-java-applet;version=1.4.1:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.4.2:class,jar:IcedTea;"         \
-  "application/x-java-applet;version=1.5:class,jar:IcedTea;"           \
-  "application/x-java-applet;version=1.6:class,jar:IcedTea;"           \
-  "application/x-java-applet;jpi-version=1.6.0_00:class,jar:IcedTea;"  \
-  "application/x-java-bean:class,jar:IcedTea;"                         \
-  "application/x-java-bean;version=1.1:class,jar:IcedTea;"             \
-  "application/x-java-bean;version=1.1.1:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.1.2:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.1.3:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.2:class,jar:IcedTea;"             \
-  "application/x-java-bean;version=1.2.1:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.2.2:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.3:class,jar:IcedTea;"             \
-  "application/x-java-bean;version=1.3.1:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.4:class,jar:IcedTea;"             \
-  "application/x-java-bean;version=1.4.1:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.4.2:class,jar:IcedTea;"           \
-  "application/x-java-bean;version=1.5:class,jar:IcedTea;"             \
-  "application/x-java-bean;version=1.6:class,jar:IcedTea;"             \
-  "application/x-java-bean;jpi-version=1.6.0_00:class,jar:IcedTea;"
-#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
-#define PLUGIN_MIME_TYPE "application/x-java-vm"
-#define PLUGIN_FILE_EXTS "class,jar,zip"
-#define PLUGIN_MIME_COUNT 1
-
-#define FAILURE_MESSAGE "gcjwebplugin error: Failed to run %s." \
-  "  For more detail rerun \"firefox -g\" in a terminal window."
-
-// Documentbase retrieval required definition.
-static NS_DEFINE_IID (kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID);
-
-// Browser function table.
-static NPNetscapeFuncs browserFunctions;
-
-// Data directory for plugin.
-static gchar* data_directory = NULL;
-
-// Fully-qualified appletviewer executable.
-static gchar* appletviewer_executable = NULL;
-
-// Keeps track of initialization. NP_Initialize should only be
-// called once.
-gboolean initialized = false;
-
-// GCJPluginData stores all the data associated with a single plugin
-// instance.  A separate plugin instance is created for each <APPLET>
-// tag.  For now, each plugin instance spawns its own applet viewer
-// process but this may need to change if we find pages containing
-// multiple applets that expect to be running in the same VM.
-struct GCJPluginData
-{
-  // A unique identifier for this plugin window.
-  gchar* instance_string;
-  // Applet viewer input pipe name.
-  gchar* in_pipe_name;
-  // Applet viewer input channel.
-  GIOChannel* in_from_appletviewer;
-  // Applet viewer input watch source.
-  gint in_watch_source;
-  // Applet viewer output pipe name.
-  gchar* out_pipe_name;
-  // Applet viewer output channel.
-  GIOChannel* out_to_appletviewer;
-  // Applet viewer output watch source.
-  gint out_watch_source;
-  // Mutex to protect appletviewer_alive.
-  GMutex* appletviewer_mutex;
-  // Back-pointer to the plugin instance to which this data belongs.
-  // This should not be freed but instead simply set to NULL.
-  NPP owner;
-  // FALSE if the applet viewer process has died.  All code
-  // communicating with the applet viewer should check this flag
-  // before attempting to read from/write to the applet viewer pipes.
-  gboolean appletviewer_alive;
-  // The address of the plugin window.  This should not be freed but
-  // instead simply set to NULL.
-  gpointer window_handle;
-  // The last plugin window width sent to us by the browser.
-  guint32 window_width;
-  // The last plugin window height sent to us by the browser.
-  guint32 window_height;
-};
-
-// Documentbase retrieval type-punning union.
-typedef union
-{
-  void** void_field;
-  nsIPluginTagInfo2** info_field;
-} info_union;
-
-// Static instance helper functions.
-// Have the browser allocate a new GCJPluginData structure.
-static void plugin_data_new (GCJPluginData** data);
-// Retrieve the current document's documentbase.
-static gchar* plugin_get_documentbase (NPP instance);
-// Notify the user that the appletviewer is not installed correctly.
-static void plugin_display_failure_dialog ();
-// Callback used to monitor input pipe status.
-static gboolean plugin_in_pipe_callback (GIOChannel* source,
-                                         GIOCondition condition,
-                                         gpointer plugin_data);
-// Callback used to monitor output pipe status.
-static gboolean plugin_out_pipe_callback (GIOChannel* source,
-                                          GIOCondition condition,
-                                          gpointer plugin_data);
-static NPError plugin_start_appletviewer (GCJPluginData* data);
-static gchar* plugin_create_applet_tag (int16 argc, char* argn[],
-                                        char* argv[]);
-static void plugin_send_message_to_appletviewer (GCJPluginData* data,
-                                                 gchar const* message);
-static void plugin_stop_appletviewer (GCJPluginData* data);
-// Uninitialize GCJPluginData structure and delete pipes.
-static void plugin_data_destroy (GCJPluginData** data);
-
-// Global instance counter.
-// Mutex to protect plugin_instance_counter.
-static GMutex* plugin_instance_mutex = NULL;
-// A counter used to create uniquely named pipes.
-static gulong plugin_instance_counter = 0;
-// A global variable for reporting GLib errors.  This must be free'd
-// and set to NULL after each use.
-static GError* channel_error = NULL;
-
-// Functions prefixed by GCJ_ are instance functions.  They are called
-// by the browser and operate on instances of GCJPluginData.
-// Functions prefixed by plugin_ are static helper functions.
-// Functions prefixed by NP_ are factory functions.  They are called
-// by the browser and provide functionality needed to create plugin
-// instances.
-
-// INSTANCE FUNCTIONS
-
-// Creates a new gcjwebplugin instance.  This function creates a
-// GCJPluginData* and stores it in instance->pdata.  The following
-// GCJPluginData fiels are initialized: instance_string, in_pipe_name,
-// in_from_appletviewer, in_watch_source, out_pipe_name,
-// out_to_appletviewer, out_watch_source, appletviewer_mutex, owner,
-// appletviewer_alive.  In addition two pipe files are created.  All
-// of those fields must be properly destroyed, and the pipes deleted,
-// by GCJ_Destroy.  If an error occurs during initialization then this
-// function will free anything that's been allocated so far, set
-// instance->pdata to NULL and return an error code.
-NPError
-GCJ_New (NPMIMEType pluginType, NPP instance, uint16 mode,
-         int16 argc, char* argn[], char* argv[],
-         NPSavedData* saved)
-{
-  PLUGIN_DEBUG ("GCJ_New");
-
-  NPError np_error = NPERR_NO_ERROR;
-  GCJPluginData* data = NULL;
-
-  gchar* documentbase = NULL;
-  gchar* read_message = NULL;
-  gchar* applet_tag = NULL;
-  gchar* tag_message = NULL;
-
-  if (!instance)
-    {
-      PLUGIN_ERROR ("Browser-provided instance pointer is NULL.");
-      np_error = NPERR_INVALID_INSTANCE_ERROR;
-      goto cleanup_done;
-    }
-
-  // data
-  plugin_data_new (&data);
-  if (data == NULL)
-    {
-      PLUGIN_ERROR ("Failed to allocate plugin data.");
-      np_error = NPERR_OUT_OF_MEMORY_ERROR;
-      goto cleanup_done;
-    }
-
-  // Initialize data->instance_string.
-  //
-  // instance_string should be unique for this process so we use a
-  // combination of getpid and plugin_instance_counter.
-  //
-  // Critical region.  Reference and increment plugin_instance_counter
-  // global.
-  g_mutex_lock (plugin_instance_mutex);
-
-  // data->instance_string
-  data->instance_string = g_strdup_printf ("instance-%d-%ld",
-                                           getpid (),
-                                           plugin_instance_counter++);
-
-  g_mutex_unlock (plugin_instance_mutex);
-
-  // data->appletviewer_mutex
-  data->appletviewer_mutex = g_mutex_new ();
-
-  // Documentbase retrieval.
-  documentbase = plugin_get_documentbase (instance);
-  if (!documentbase)
-    {
-      PLUGIN_ERROR ("Documentbase retrieval failed."
-                    " Browser not Mozilla-based?");
-      goto cleanup_appletviewer_mutex;
-    }
-
-  // Create appletviewer-to-plugin pipe which we refer to as the input
-  // pipe.
-
-  // data->in_pipe_name
-  data->in_pipe_name = g_strdup_printf ("%s/gcj-%s-appletviewer-to-plugin", 
-                                         data_directory, data->instance_string);
-  if (!data->in_pipe_name)
-    {
-      PLUGIN_ERROR ("Failed to create input pipe name.");
-      np_error = NPERR_OUT_OF_MEMORY_ERROR;
-      // If data->in_pipe_name is NULL then the g_free at
-      // cleanup_in_pipe_name will simply return.
-      goto cleanup_in_pipe_name;
-    }
-


From gnu_andrew at member.fsf.org  Wed Nov 19 17:59:06 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 20 Nov 2008 01:59:06 +0000
Subject: changeset in /hg/icedtea: Support NIO2.
Message-ID: <hg.1ae3ef81f9b2.1227146346.-6899778133799504387@icedtea.classpath.org>

changeset 1ae3ef81f9b2 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1ae3ef81f9b2
description:
	Support NIO2.

	2008-09-04  C. K. Jester-Young  <cky944 at gmail.com>

		* Makefile.am,
		* acinclude.m4:
		Add support for NIO2.

diffstat:

3 files changed, 13 insertions(+), 1 deletion(-)
ChangeLog    |    6 ++++++
Makefile.am  |    5 +++++
acinclude.m4 |    3 ++-

diffs (62 lines):

diff -r 1427ec4417d3 -r 1ae3ef81f9b2 ChangeLog
--- a/ChangeLog	Wed Nov 19 12:47:19 2008 +0000
+++ b/ChangeLog	Thu Nov 20 00:41:27 2008 +0000
@@ -1,3 +1,9 @@ 2008-11-19  Andrew John Hughes  <ahughes
+2008-09-04  C. K. Jester-Young  <cky944 at gmail.com>
+
+	* Makefile.am,
+	* acinclude.m4:
+	Add support for NIO2.
+
 2008-11-19  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-version.patch,
diff -r 1427ec4417d3 -r 1ae3ef81f9b2 Makefile.am
--- a/Makefile.am	Wed Nov 19 12:47:19 2008 +0000
+++ b/Makefile.am	Thu Nov 20 00:41:27 2008 +0000
@@ -1552,6 +1552,7 @@ CLOSURES_HG_URL = http://hg.openjdk.java
 CLOSURES_HG_URL = http://hg.openjdk.java.net/closures/closures/
 CACIOCAVALLO_HG_URL = http://hg.openjdk.java.net/caciocavallo/jdk7/
 BSD_HG_URL = http://hg.openjdk.java.net/bsd-port/bsd-port
+NIO2_HG_URL = http://hg.openjdk.java.net/nio/nio/
 
 OPENJDK_URL = http://www.java.net/download/openjdk/jdk7/promoted/$(OPENJDK_VERSION)/
 if USE_ALT_OPENJDK_SRC_ZIP
@@ -1612,6 +1613,9 @@ else
 else
 if USE_BSD
 	$(HG) fclone $(BSD_HG_URL) openjdk;
+else
+if USE_NIO2
+	hg fclone $(NIO2_HG_URL) openjdk;
 else
 if USE_HG
 	$(HG) fclone -r jdk7-$(OPENJDK_VERSION) $(OPENJDK_HG_URL) openjdk;
@@ -1625,6 +1629,7 @@ else
 	  fi ; \
 	  $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP) -O $(OPENJDK_SRC_ZIP); \
 	fi
+endif
 endif
 endif
 endif
diff -r 1427ec4417d3 -r 1ae3ef81f9b2 acinclude.m4
--- a/acinclude.m4	Wed Nov 19 12:47:19 2008 +0000
+++ b/acinclude.m4	Thu Nov 20 00:41:27 2008 +0000
@@ -968,7 +968,7 @@ AC_DEFUN([WITH_PROJECT],
 [
   AC_MSG_CHECKING(which OpenJDK project is being used)
   AC_ARG_WITH([project],
-              [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: jdk7 closures cvmi cacioavallo bsd [[default=jdk7]])],
+              [AS_HELP_STRING(--with-project,choose the OpenJDK project to use: jdk7 closures cvmi caciocavallo bsd nio2 [[default=jdk7]])],
   [
     case "${withval}" in
       yes)
@@ -991,6 +991,7 @@ AC_DEFUN([WITH_PROJECT],
   AM_CONDITIONAL([USE_CVMI], test x"${project}" = "xcvmi")
   AM_CONDITIONAL([USE_CACIOCAVALLO], test x"${project}" = "xcaciocavallo")
   AM_CONDITIONAL([USE_BSD], test x"${project}" = "xbsd")
+  AM_CONDITIONAL([USE_NIO2], test x"${project}" = "xnio2")
 ])
 
 AC_DEFUN([AC_CHECK_WITH_GCJ],


From mark at klomp.org  Thu Nov 20 09:30:33 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 20 Nov 2008 18:30:33 +0100
Subject: Public open specs
In-Reply-To: <49219AF0.6070407@sun.com>
References: <20080917084136.GA10250@bamboo.destinee.acro.gen.nz>
	<1226579378.4563.15.camel@dijkstra.wildebeest.org>
	<491C9E25.6050301@sun.com>
	<1226614223.10363.4.camel@hermans.wildebeest.org>
	<491CAD1C.8040106@sun.com>
	<1226619088.5290.4.camel@dijkstra.wildebeest.org>
	<491D858C.70109@sun.com>
	<1226674908.3266.58.camel@dijkstra.wildebeest.org>
	<491DC160.4030004@sun.com>
	<1226739682.16426.29.camel@hermans.wildebeest.org>
	<17c6771e0811151650g798290b3t7f76f78bb463442b@mail.gmail.com>
	<49219AF0.6070407@sun.com>
Message-ID: <1227202233.3306.30.camel@dijkstra.wildebeest.org>

Hi Dalibor,

On Mon, 2008-11-17 at 17:25 +0100, Dalibor Topic wrote:
> Andrew John Hughes wrote:
> >> Getting all these JSRs published freely and openly without click-through
> >> like you want to do for the JVM spec would solve all these issues.
> >
> > Couldn't agree more.  Why is it the specs for TCP (an RFC) and HTML
> > (W3C recommendation) are published openly on the web, yet the JSR
> > specifications are hidden behind pages of legalese?  Whether its onus
> > or not, it still has to be read and approved and is enough to
> > introduce doubt into people's minds.  If we could just load up a web
> > page and read them with no click-throughs, life would be much easier.
> >   
> Thank you both for taking the time to explain your concerns, and
> provide me with a toolchest of arguments to pick from.
> 
> I'll go work on my poking tools now.

Thanks. Please do let us know what the progress/timeline is.
If we can do anything to speed things up, just yell.

Cheers,

Mark



From mark at klomp.org  Thu Nov 20 09:32:22 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 20 Nov 2008 18:32:22 +0100
Subject: [OpenJDK 2D-Dev] Bug in pisces Renderer	(uninitialized	crossings)
In-Reply-To: <491C64FE.4070408@sun.com>
References: <1225119212.3329.29.camel@dijkstra.wildebeest.org>
	<1225791009.3320.4.camel@dijkstra.wildebeest.org>
	<1226579411.4563.17.camel@dijkstra.wildebeest.org>
	<491C64FE.4070408@sun.com>
Message-ID: <1227202342.3306.33.camel@dijkstra.wildebeest.org>

Hi Igor,

On Thu, 2008-11-13 at 20:33 +0300, Igor Nekrestyanov wrote:
> your patch looks ok to me but i am not expert in pisces.
> 
> Alexey Ushakov, who is our expert in pisces should have returned from 
> vacation today
> and i think he will review this soon.

Thanks for looking at it. If I can help with any review, by clarifying
anything, please let me know.

Cheers,

Mark

> >>> Attached is the workaround that I checked into IcedTea to make this work
> >>> reliably:
> >>>
> >>> 2008-10-27  Mark Wielaard  <mark at klomp.org>
> >>>
> >>>         * patches/icedtea-renderer-crossing.patch: New patch.
> >>>         * Makefile.am (ICEDTEA_PATCHES): Add new patch.
> >>>         * HACKING: Document new patch.




From mark at klomp.org  Thu Nov 20 09:48:43 2008
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 20 Nov 2008 18:48:43 +0100
Subject: OpenJDK 6 build 12 source posted (directaudio/alsa backend)
In-Reply-To: <1225981629.4621.25.camel@dijkstra.wildebeest.org>
References: <48CAB08F.6010407@sun.com>
	<1221402124.3542.40.camel@dijkstra.wildebeest.org>
	<48D7F80E.6060802@sun.com>
	<1225981629.4621.25.camel@dijkstra.wildebeest.org>
Message-ID: <1227203323.3306.47.camel@dijkstra.wildebeest.org>

On Thu, 2008-11-06 at 15:27 +0100, Mark Wielaard wrote:
> Hi Joe, hi Alex,
> 
> On Mon, 2008-09-22 at 12:54 -0700, Joseph D. Darcy wrote:
> > Mark Wielaard wrote:
> > > Although not in your changelogs, I saw you also included two of my fixes
> > > for the ALSA directaudio backend which I posted back in May on
> > > sound-dev, and which are included in icedtea already.
> > > - The sloppy open/close patch:
> > > http://mail.openjdk.java.net/pipermail/sound-dev/2008-May/000053.html
> > > - The ALSA native lock patch:
> > > http://mail.openjdk.java.net/pipermail/sound-dev/2008-May/000054.html
> > >
> > > Although it makes some applets that use some primitive sound output work
> > > better I never got a real response. Did you get someone from the sound
> > > team to look at these patches? They do seem to work for me and the few
> > > test users of those applets, but a full review by one of the sound
> > > engineers would be appreciated. They don't seem to be in the JDK7 tree.
> > >   
> > No; the patches were not explicitly reviewed; Alex, please take a look 
> > at them.
> 
> While these are being reviewed it might be nice if some of the
> additional fixes for the DirectAudio ALSA code that were added by Omair
> were also reviewed:
> 
> - Use the ALSA 'default' device if possible.
>   patches/icedtea-alsa-default-device.patch
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-November/003844.html
> 
> - Fix linker order:
>   patches/icedtea-linker-libs-order.patch
> http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2008-November/003845.html

Omair told me on irc that that last one more a generic build fix, not
directly just for the sound build itself. So, this might be more
relevant for the build-dev list. But any comments on the other three
patches highly appreciated.

Cheers,

Mark



From gnu_andrew at member.fsf.org  Thu Nov 20 14:36:14 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 20 Nov 2008 22:36:14 +0000
Subject: changeset in /hg/icedtea: Added tag icedtea-1.8 for changeset 3c...
Message-ID: <hg.048bafd8096f.1227220574.-6899778133799504387@icedtea.classpath.org>

changeset 048bafd8096f in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=048bafd8096f
description:
	Added tag icedtea-1.8 for changeset 3ced1c5f1403

diffstat:

1 file changed, 1 insertion(+)
.hgtags |    1 +

diffs (8 lines):

diff -r 3ced1c5f1403 -r 048bafd8096f .hgtags
--- a/.hgtags	Thu Nov 20 22:35:39 2008 +0000
+++ b/.hgtags	Thu Nov 20 22:35:54 2008 +0000
@@ -11,3 +11,4 @@ 8bbc4ffe2c7c542f9aa7d26f823e50f0dd036ce9
 8bbc4ffe2c7c542f9aa7d26f823e50f0dd036ce9 icedtea-1.7
 3ef9c9c4e70b8204b73fa9b88243f49f59c2a23f icedtea6-1.3
 be368b1e3c7dca9b4dfe8e8f40be794ecfbef22e icedtea6-1.3.1
+3ced1c5f140358bf1d1ef569017b7914f36d6a5e icedtea-1.8


From gnu_andrew at member.fsf.org  Thu Nov 20 14:36:14 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 20 Nov 2008 22:36:14 +0000
Subject: changeset in /hg/icedtea: Prepare for 1.8 release.
Message-ID: <hg.3ced1c5f1403.1227220574.-6899778133799504387@icedtea.classpath.org>

changeset 3ced1c5f1403 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=3ced1c5f1403
description:
	Prepare for 1.8 release.

	2008-11-20  Andrew John Hughes  <ahughes at redhat.com>

		Prepare for 1.8 release.
		* NEWS: Updated.
		* configure.ac: Bump to 1.8.

diffstat:

3 files changed, 15 insertions(+), 4 deletions(-)
ChangeLog    |    6 ++++++
NEWS         |   11 ++++++++---
configure.ac |    2 +-

diffs (48 lines):

diff -r c5f13156e70a -r 3ced1c5f1403 ChangeLog
--- a/ChangeLog	Thu Nov 20 01:58:47 2008 +0000
+++ b/ChangeLog	Thu Nov 20 22:35:39 2008 +0000
@@ -1,3 +1,9 @@ 2008-11-20  Andrew John Hughes  <ahughes
+2008-11-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	Prepare for 1.8 release.
+	* NEWS: Updated.
+	* configure.ac: Bump to 1.8.
+
 2008-11-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/236:
diff -r c5f13156e70a -r 3ced1c5f1403 NEWS
--- a/NEWS	Thu Nov 20 01:58:47 2008 +0000
+++ b/NEWS	Thu Nov 20 22:35:39 2008 +0000
@@ -1,13 +1,18 @@ New in release 1.8 (XXXX-XX-XX)
-New in release 1.8 (XXXX-XX-XX)
+New in release 1.8 (2008-11-20)
 
   IcedTea is based on the hard work of a lot of people that contributed to
   IcedTea6 and OpenJDK. The following noteworthy changes were added in
   this release:
 
-- Updated to b38 build.
+- Updated to b39 build.
+- Support for external projects (closures, caciocavallo, cvmi, bsd, nio2).
+  Note that these are based on Mercurial repositories so may require local
+  changes for a working build due to noticeable differences between the
+  repository and the reference OpenJDK b39 build.  At the time of release,
+  NIO2 was buildable out of the box.
 - Fixed to use new sound service, Gervill.
 - Many Netx fixes and now built by default.
-- LiveConnect support (--enable-liveconnect).
+- LiveConnect support replaces gcjwebplugin.
 - Implemented JavaScript->Java security.
 - PulseAudio integrated (--enable-pulse-java)
 - VisualVM tool integrated (--enable-visualvm).
diff -r c5f13156e70a -r 3ced1c5f1403 configure.ac
--- a/configure.ac	Thu Nov 20 01:58:47 2008 +0000
+++ b/configure.ac	Thu Nov 20 22:35:39 2008 +0000
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.8-pre], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [1.8], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.10 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST


From gnu_andrew at member.fsf.org  Thu Nov 20 16:50:29 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 21 Nov 2008 00:50:29 +0000
Subject: IcedTea 1.8 released
Message-ID: <17c6771e0811201650j421dab52m5c487c29f4a018d8@mail.gmail.com>

We are proud to announce the release of IcedTea 1.8.

The IcedTea project provides a harness to build the source code from
OpenJDK[7] (http://openjdk.java.net) using Free Software build tools and
a number of additional features including a web plugin, Web Start support
and support for additional architectures via Zero/Shark or the CACAO VM.
More information on IcedTea can be found at http://icedtea.classpath.org

What's New?
==========
  IcedTea is based on the hard work of a lot of people that contributed to
  IcedTea6 and OpenJDK. The following noteworthy changes were added in
  this release:

- Updated to b39 build.
- Support for external projects (closures, caciocavallo, cvmi, bsd, nio2).
  Note that these are based on Mercurial repositories so may require local
  changes for a working build due to noticeable differences between the
  repository and the reference OpenJDK b39 build.  At the time of release,
  NIO2 was buildable out of the box.
- Fixed to use new sound service, Gervill.
- Many Netx fixes and now built by default.
- LiveConnect support replaces gcjwebplugin.
- Implemented JavaScript->Java security.
- PulseAudio integrated (--enable-pulse-java)
- VisualVM tool integrated (--enable-visualvm).
- Added out-of-the-box CACAO support (--with-cacao).
- Added the experimental Shark JIT for Zero.
- Cleaned up crypto support, all algorithms and key sizes are fully
  supported now without any (regional) restrictions. No more need for
  separate crypto policy jars.
- Integration of Mozilla Rhino javascript support for javax.script.
  (See http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179 when
   you want to enable non-system-installed versions of Rhino).
- Add support for Zero builds on alpha, arm, mips, mipsel, m68k, s390.
- Various build fixes.
- Several bug and security fixes.
- Plugin including LiveConnect support built as default.
- Various bugs fixed: renderer patch, version string updated,
chinese fonts filename fix for Fedora etc.
- More progress on Shark and Cacao.
- Several plugin bug fixes.
- Several build fixes.

??????

The tarball can be downloaded here:

http://icedtea.classpath.org/download/source/icedtea-1.8.tar.gz

The following people helped with this release:
Lillian Angel, Gary Benson, Deepak Bhole, Alon Bar-Lev, Tom Callaway,
Pablo del Campo, Thomas Fitzsimmons,  Dennis Gilmore, Andrew Haley,
Andrew John Hughes, Ioana Ivan, Matthias Klose, DJ Lucas, Omair Majid,
Xerxes Ranby, Marc Schoenefeld, Keith Seitz, Joshua Sumali, Christian
Thalinger and Mark Wielaard.
We would also like to thank the bug reporters and testers!

Full build requirements and instructions can be found in the INSTALL
file in the top-level directory of the release. However,

$ ./configure
$ make

should be a good start.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8

From gnu_andrew at member.fsf.org  Fri Nov 21 00:42:50 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 21 Nov 2008 08:42:50 +0000
Subject: changeset in /hg/icedtea: Bump to 1.9-pre.
Message-ID: <hg.ca3f32ace7ef.1227256970.-6899778133799504387@icedtea.classpath.org>

changeset ca3f32ace7ef in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=ca3f32ace7ef
description:
	Bump to 1.9-pre.

	2008-11-21  Andrew John Hughes  <ahughes at redhat.com>

		* NEWS,
		* configure.ac:
		Bump to 1.9-pre.

diffstat:

3 files changed, 9 insertions(+), 1 deletion(-)
ChangeLog    |    6 ++++++
NEWS         |    2 ++
configure.ac |    2 +-

diffs (32 lines):

diff -r 048bafd8096f -r ca3f32ace7ef ChangeLog
--- a/ChangeLog	Thu Nov 20 22:35:54 2008 +0000
+++ b/ChangeLog	Fri Nov 21 08:42:37 2008 +0000
@@ -1,3 +1,9 @@ 2008-11-20  Andrew John Hughes  <ahughes
+2008-11-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS,
+	* configure.ac:
+	Bump to 1.9-pre.
+
 2008-11-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	Prepare for 1.8 release.
diff -r 048bafd8096f -r ca3f32ace7ef NEWS
--- a/NEWS	Thu Nov 20 22:35:54 2008 +0000
+++ b/NEWS	Fri Nov 21 08:42:37 2008 +0000
@@ -1,3 +1,5 @@ New in release 1.8 (2008-11-20)
+New in release 1.9 (XXXX-XX-XX)
+
 New in release 1.8 (2008-11-20)
 
   IcedTea is based on the hard work of a lot of people that contributed to
diff -r 048bafd8096f -r ca3f32ace7ef configure.ac
--- a/configure.ac	Thu Nov 20 22:35:54 2008 +0000
+++ b/configure.ac	Fri Nov 21 08:42:37 2008 +0000
@@ -1,5 +1,5 @@ AC_PREREQ([2.61])
 AC_PREREQ([2.61])
-AC_INIT([icedtea], [1.8], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [1.9-pre], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.10 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 AC_CANONICAL_HOST


From gnu_andrew at member.fsf.org  Fri Nov 21 02:30:10 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 21 Nov 2008 10:30:10 +0000
Subject: changeset in /hg/icedtea: Bump to b40.
Message-ID: <hg.d8e977068163.1227263410.-6899778133799504387@icedtea.classpath.org>

changeset d8e977068163 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d8e977068163
description:
	Bump to b40.

	2008-11-21  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Bump to b40.

diffstat:

2 files changed, 8 insertions(+), 3 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    6 +++---

diffs (25 lines):

diff -r ca3f32ace7ef -r d8e977068163 ChangeLog
--- a/ChangeLog	Fri Nov 21 08:42:37 2008 +0000
+++ b/ChangeLog	Fri Nov 21 10:29:58 2008 +0000
@@ -1,3 +1,8 @@ 2008-11-21  Andrew John Hughes  <ahughes
+2008-11-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Bump to b40.
+	
 2008-11-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS,
diff -r ca3f32ace7ef -r d8e977068163 Makefile.am
--- a/Makefile.am	Fri Nov 21 08:42:37 2008 +0000
+++ b/Makefile.am	Fri Nov 21 10:29:58 2008 +0000
@@ -1,6 +1,6 @@ OPENJDK_DATE = 06_nov_2008
-OPENJDK_DATE = 06_nov_2008
-OPENJDK_MD5SUM = 57062779a3c844621865faef8d423ad9
-OPENJDK_VERSION = b39
+OPENJDK_DATE = 20_nov_2008
+OPENJDK_MD5SUM = b55ade3ce62c4325d5128c7ce67873d7
+OPENJDK_VERSION = b40
 
 CACAO_VERSION = 0.99.3
 CACAO_MD5SUM = 80de3ad344c1a20c086ec5f1390bd1b8


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 21 06:53:43 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 21 Nov 2008 14:53:43 +0000
Subject: [Bug 218] eclipse ganimede crash with open jdk 1.6 on fedora 9
Message-ID: <E1L3XOB-0003tE-Id@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=218





------- Comment #2 from nessuno.itaca at gmail.com  2008-11-21 14:53 -------
(In reply to comment #1)
> can you retest this with the version of openjdk in rawhide?
> 

I understood the problem. It was my motherboard. It was a problem regarding
reading and writing the ram. Now I'm changed my motherboard and cpu and all
seems to work fine. I've to say that it seems that it's not further need to
configure eclipse with an old version of XULRunner (1.8). I've only observed
that the ganymede 64bit version is a lot more greed of RAM than 32 one.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 21 07:03:50 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 21 Nov 2008 15:03:50 +0000
Subject: [Bug 218] eclipse ganimede crash with open jdk 1.6 on fedora 9
Message-ID: <E1L3XXy-0003tu-W3@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=218


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |INVALID




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From aph at redhat.com  Fri Nov 21 10:54:18 2008
From: aph at redhat.com (Andrew Haley)
Date: Fri, 21 Nov 2008 18:54:18 +0000
Subject: A bunch of Shark fixes
Message-ID: <492703DA.60505@redhat.com>

This is a combination of endian fixes, wordsize fizes, and a change to work
with the latest LLVM.

Shark still doesn't work right on x86_64, though: more to do.

Andrew.


2008-11-21  Andrew Haley  <aph at redhat.com>

	* ports/hotspot/src/share/vm/shark/sharkValue.hpp
	(class SharkComputableValue): Use IRBuilder<>, not IRBuilder.
	(class SharkValue): Use IRBuilder<>, not IRBuilder.
	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
	(SharkFunction::CreatePopFrame): Change a few jint_types to
	intptr_types.
	* ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
	(SharkConstantPool::cache_entry_at): Byte-swap the cache index.
	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	(SharkBuilder::SharkBuilder) Inherit from template class
	IRBuilder<>.
	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp:
	(SharkBuilder::SharkBuilder) Inherit from template class
	IRBuilder<>.
	Change a few jint_types to intptr_types.	
	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
	(SharkBlock::get_interface_callee): Change a few jint_types to
	intptr_types.

diff -r ff7010bc3cae ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Nov 21 17:43:16 2008 +0000
@@ -1814,6 +1814,8 @@
     in_ByteSize(instanceKlass::vtable_length_offset() * HeapWordSize),
     SharkType::jint_type(),
     "vtable_length");
+  vtable_length =
+    builder()->CreateIntCast(vtable_length, SharkType::intptr_type(), false);

   bool needs_aligning = HeapWordsPerLong > 1;
   const char *itable_start_name = "itable_start";
@@ -1821,7 +1823,7 @@
     vtable_start,
     builder()->CreateShl(
       vtable_length,
-      LLVMValue::jint_constant(exact_log2(vtableEntry::size() * wordSize))),
+      LLVMValue::intptr_constant(exact_log2(vtableEntry::size() * wordSize))),
     needs_aligning ? "" : itable_start_name);
   if (needs_aligning)
     itable_start = builder()->CreateAlign(
@@ -1878,6 +1880,8 @@
     in_ByteSize(itableOffsetEntry::offset_offset_in_bytes()),
     SharkType::jint_type(),
     "offset");
+  offset =
+    builder()->CreateIntCast(offset, SharkType::intptr_type(), false);

   Value *index = builder()->CreateValueOfStructEntry(
     cache, ConstantPoolCacheEntry::f2_offset(),
@@ -1894,7 +1898,7 @@
             offset),
           builder()->CreateShl(
             index,
-            LLVMValue::jint_constant(
+            LLVMValue::intptr_constant(
               exact_log2(itableMethodEntry::size() * wordSize)))),
         LLVMValue::intptr_constant(
           itableMethodEntry::method_offset_in_bytes())),
diff -r ff7010bc3cae ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Nov 21 17:43:16 2008 +0000
@@ -29,7 +29,7 @@
 using namespace llvm;

 SharkBuilder::SharkBuilder()
-  : IRBuilder(),
+  : IRBuilder<>(),
       _module("shark"),
       _module_provider(module()),
       _execution_engine(ExecutionEngine::create(&_module_provider))
diff -r ff7010bc3cae ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Fri Nov 21 17:43:16 2008 +0000
@@ -23,7 +23,7 @@
  *
  */

-class SharkBuilder : public llvm::IRBuilder {
+class SharkBuilder : public llvm::IRBuilder<> {
  public:
   SharkBuilder();

@@ -81,13 +81,13 @@
                                   llvm::Value*      index,
                                   const char*       name = "")
   {
-    llvm::Value* offset = index;
+    llvm::Value* offset = CreateIntCast(index, SharkType::intptr_type(), false);
     if (element_bytes != 1)
       offset = CreateShl(
         offset,
-        LLVMValue::jint_constant(exact_log2(element_bytes)));
+        LLVMValue::intptr_constant(exact_log2(element_bytes)));
     offset = CreateAdd(
-      LLVMValue::jint_constant(in_bytes(base_offset)), offset);
+      LLVMValue::intptr_constant(in_bytes(base_offset)), offset);

     return CreateIntToPtr(
       CreateAdd(CreatePtrToInt(arrayoop, SharkType::intptr_type()), offset),
diff -r ff7010bc3cae ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp	Fri Nov 21 17:43:16 2008 +0000
@@ -82,6 +82,12 @@

 Value *SharkConstantPool::cache_entry_at(int which)
 {
+  // Takes a constant pool cache index in byte-swapped byte order
+  // (which comes from the bytecodes after rewriting).  This is a
+  // bizarre hack but it's the same as
+  // constantPoolOopDesc::field_or_method_at().
+  which = Bytes::swap_u2(which);
+
   Value *entry = builder()->CreateIntToPtr(
     builder()->CreateAdd(
       builder()->CreatePtrToInt(
@@ -109,7 +115,7 @@
       builder()->CreateValueOfStructEntry(
         entry, ConstantPoolCacheEntry::indices_offset(),
         SharkType::intptr_type()),
-      LLVMValue::jint_constant(shift)),
+      LLVMValue::intptr_constant(shift)),
     LLVMValue::intptr_constant(0xff));

   BasicBlock *orig_block = builder()->GetInsertBlock();
diff -r ff7010bc3cae ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Nov 21 17:43:16 2008 +0000
@@ -182,7 +182,7 @@
   Value *fp = CreateLoadZeroFramePointer();
   Value *sp = builder()->CreateAdd(
     fp,
-    LLVMValue::jint_constant((1 + locals_to_pop) * wordSize));
+    LLVMValue::intptr_constant((1 + locals_to_pop) * wordSize));

   CreateStoreZeroStackPointer(sp);
   CreateStoreZeroFramePointer(
diff -r ff7010bc3cae ports/hotspot/src/share/vm/shark/sharkValue.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Fri Nov 21 17:43:16 2008 +0000
@@ -246,7 +246,7 @@
   {
     ShouldNotCallThis();
   }
-  virtual llvm::Value* intptr_value(llvm::IRBuilder* builder) const
+  virtual llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const
   {
     ShouldNotCallThis();
   }
@@ -370,7 +370,7 @@
   {
     return llvm_value();
   }
-  llvm::Value* intptr_value(llvm::IRBuilder* builder) const
+  llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const
   {
     assert(is_jobject(), "should be");
     return builder->CreatePtrToInt(llvm_value(), SharkType::intptr_type());


From aph at redhat.com  Fri Nov 21 10:56:55 2008
From: aph at redhat.com (Andrew Haley)
Date: Fri, 21 Nov 2008 18:56:55 +0000
Subject: changeset in /hg/icedtea6: 2008-11-21  Andrew Haley  <aph@redhat...
Message-ID: <hg.8af2ec380258.1227293815.2873452341184383832@icedtea.classpath.org>

changeset 8af2ec380258 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8af2ec380258
description:
	2008-11-21  Andrew Haley  <aph at redhat.com>

	        * ports/hotspot/src/share/vm/shark/sharkValue.hpp
	        (class SharkComputableValue): Use IRBuilder<>, not IRBuilder.
	        (class SharkValue): Use IRBuilder<>, not IRBuilder.
	        * ports/hotspot/src/share/vm/shark/sharkFunction.cpp
	        (SharkFunction::CreatePopFrame): Change a few jint_types to
	        intptr_types.
	        * ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
	        (SharkConstantPool::cache_entry_at): Byte-swap the cache index.
	        * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
	        (SharkBuilder::SharkBuilder) Inherit from template class
	        IRBuilder<>.
	        * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp:
	        (SharkBuilder::SharkBuilder) Inherit from template class
	        IRBuilder<>.
	        Change a few jint_types to intptr_types.
	        * ports/hotspot/src/share/vm/shark/sharkBlock.cpp
	        (SharkBlock::get_interface_callee): Change a few jint_types to
	        intptr_types.

diffstat:

6 files changed, 21 insertions(+), 11 deletions(-)
ports/hotspot/src/share/vm/shark/sharkBlock.cpp        |    8 ++++++--
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp      |    2 +-
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp      |    8 ++++----
ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp |    8 +++++++-
ports/hotspot/src/share/vm/shark/sharkFunction.cpp     |    2 +-
ports/hotspot/src/share/vm/shark/sharkValue.hpp        |    4 ++--

diffs (138 lines):

diff -r ff7010bc3cae -r 8af2ec380258 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Nov 21 18:56:47 2008 +0000
@@ -1814,6 +1814,8 @@ Value* SharkBlock::get_interface_callee(
     in_ByteSize(instanceKlass::vtable_length_offset() * HeapWordSize),
     SharkType::jint_type(),
     "vtable_length");
+  vtable_length =
+    builder()->CreateIntCast(vtable_length, SharkType::intptr_type(), false);
 
   bool needs_aligning = HeapWordsPerLong > 1;
   const char *itable_start_name = "itable_start";
@@ -1821,7 +1823,7 @@ Value* SharkBlock::get_interface_callee(
     vtable_start,
     builder()->CreateShl(
       vtable_length,
-      LLVMValue::jint_constant(exact_log2(vtableEntry::size() * wordSize))),
+      LLVMValue::intptr_constant(exact_log2(vtableEntry::size() * wordSize))),
     needs_aligning ? "" : itable_start_name);
   if (needs_aligning)
     itable_start = builder()->CreateAlign(
@@ -1878,6 +1880,8 @@ Value* SharkBlock::get_interface_callee(
     in_ByteSize(itableOffsetEntry::offset_offset_in_bytes()),
     SharkType::jint_type(),
     "offset");
+  offset =
+    builder()->CreateIntCast(offset, SharkType::intptr_type(), false);
 
   Value *index = builder()->CreateValueOfStructEntry(
     cache, ConstantPoolCacheEntry::f2_offset(),
@@ -1894,7 +1898,7 @@ Value* SharkBlock::get_interface_callee(
             offset),
           builder()->CreateShl(
             index,
-            LLVMValue::jint_constant(
+            LLVMValue::intptr_constant(
               exact_log2(itableMethodEntry::size() * wordSize)))),
         LLVMValue::intptr_constant(
           itableMethodEntry::method_offset_in_bytes())),
diff -r ff7010bc3cae -r 8af2ec380258 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Nov 21 18:56:47 2008 +0000
@@ -29,7 +29,7 @@ using namespace llvm;
 using namespace llvm;
 
 SharkBuilder::SharkBuilder()
-  : IRBuilder(),
+  : IRBuilder<>(),
       _module("shark"),
       _module_provider(module()),
       _execution_engine(ExecutionEngine::create(&_module_provider))
diff -r ff7010bc3cae -r 8af2ec380258 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Fri Nov 21 18:56:47 2008 +0000
@@ -23,7 +23,7 @@
  *
  */
 
-class SharkBuilder : public llvm::IRBuilder {
+class SharkBuilder : public llvm::IRBuilder<> {
  public:
   SharkBuilder();
 
@@ -81,13 +81,13 @@ class SharkBuilder : public llvm::IRBuil
                                   llvm::Value*      index,
                                   const char*       name = "")
   {
-    llvm::Value* offset = index;
+    llvm::Value* offset = CreateIntCast(index, SharkType::intptr_type(), false);
     if (element_bytes != 1)
       offset = CreateShl(
         offset,
-        LLVMValue::jint_constant(exact_log2(element_bytes)));
+        LLVMValue::intptr_constant(exact_log2(element_bytes)));
     offset = CreateAdd(
-      LLVMValue::jint_constant(in_bytes(base_offset)), offset);
+      LLVMValue::intptr_constant(in_bytes(base_offset)), offset);
 
     return CreateIntToPtr(
       CreateAdd(CreatePtrToInt(arrayoop, SharkType::intptr_type()), offset),
diff -r ff7010bc3cae -r 8af2ec380258 ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp	Fri Nov 21 18:56:47 2008 +0000
@@ -82,6 +82,12 @@ Value *SharkConstantPool::tag_at(int whi
 
 Value *SharkConstantPool::cache_entry_at(int which)
 {
+  // Takes a constant pool cache index in byte-swapped byte order
+  // (which comes from the bytecodes after rewriting).  This is a
+  // bizarre hack but it's the same as
+  // constantPoolOopDesc::field_or_method_at().
+  which = Bytes::swap_u2(which);
+
   Value *entry = builder()->CreateIntToPtr(
     builder()->CreateAdd(
       builder()->CreatePtrToInt(
@@ -109,7 +115,7 @@ Value *SharkConstantPool::cache_entry_at
       builder()->CreateValueOfStructEntry(
         entry, ConstantPoolCacheEntry::indices_offset(),
         SharkType::intptr_type()),
-      LLVMValue::jint_constant(shift)),
+      LLVMValue::intptr_constant(shift)),
     LLVMValue::intptr_constant(0xff));
 
   BasicBlock *orig_block = builder()->GetInsertBlock();
diff -r ff7010bc3cae -r 8af2ec380258 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Nov 21 18:56:47 2008 +0000
@@ -182,7 +182,7 @@ Value* SharkFunction::CreatePopFrame(int
   Value *fp = CreateLoadZeroFramePointer();
   Value *sp = builder()->CreateAdd(
     fp,
-    LLVMValue::jint_constant((1 + locals_to_pop) * wordSize));
+    LLVMValue::intptr_constant((1 + locals_to_pop) * wordSize));
 
   CreateStoreZeroStackPointer(sp);
   CreateStoreZeroFramePointer(
diff -r ff7010bc3cae -r 8af2ec380258 ports/hotspot/src/share/vm/shark/sharkValue.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Tue Nov 18 11:04:46 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Fri Nov 21 18:56:47 2008 +0000
@@ -246,7 +246,7 @@ class SharkValue : public ResourceObj {
   {
     ShouldNotCallThis();
   }
-  virtual llvm::Value* intptr_value(llvm::IRBuilder* builder) const
+  virtual llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const
   {
     ShouldNotCallThis();
   }
@@ -370,7 +370,7 @@ class SharkComputableValue : public Shar
   {
     return llvm_value();
   }
-  llvm::Value* intptr_value(llvm::IRBuilder* builder) const
+  llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const
   {
     assert(is_jobject(), "should be");
     return builder->CreatePtrToInt(llvm_value(), SharkType::intptr_type());


From gnu_andrew at member.fsf.org  Fri Nov 21 11:40:07 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 21 Nov 2008 19:40:07 +0000
Subject: A bunch of Shark fixes
In-Reply-To: <492703DA.60505@redhat.com>
References: <492703DA.60505@redhat.com>
Message-ID: <17c6771e0811211140j1f363a50q6eb0bf5fe4e92958@mail.gmail.com>

2008/11/21 Andrew Haley <aph at redhat.com>:
> This is a combination of endian fixes, wordsize fizes, and a change to work
> with the latest LLVM.
>
> Shark still doesn't work right on x86_64, though: more to do.
>
> Andrew.

Thanks for this.  It would be great to get it work on ppc64.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From dbhole at redhat.com  Fri Nov 21 12:36:19 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Fri, 21 Nov 2008 20:36:19 +0000
Subject: changeset in /hg/icedtea6: - Fixed crashes on 64-bit.
Message-ID: <hg.85921aeaed32.1227299779.2873452341184383832@icedtea.classpath.org>

changeset 85921aeaed32 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=85921aeaed32
description:
	- Fixed crashes on 64-bit.
	- Fix freezes on certain sites.
	- Added support for java_code, java_codebase, etc.

diffstat:

7 files changed, 172 insertions(+), 84 deletions(-)
ChangeLog                                                 |   14 +
IcedTeaPlugin.cc                                          |   94 +++++++-----
plugin/icedtea/netscape/javascript/JSObject.java          |    7 
plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java |    6 
plugin/icedtea/sun/applet/PluginAppletViewer.java         |  101 ++++++++-----
plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java |   27 ++-
rt/net/sourceforge/jnlp/NetxPanel.java                    |    7 

diffs (truncated from 626 to 500 lines):

diff -r ff7010bc3cae -r 85921aeaed32 ChangeLog
--- a/ChangeLog	Tue Nov 18 11:04:46 2008 -0500
+++ b/ChangeLog	Fri Nov 21 11:39:51 2008 -0500
@@ -1,3 +1,17 @@ 2008-11-18  Deepak Bhole  <dbhole at redhat
+2008-11-21  Deepak Bhole  <dbhole at redhat.com>
+	* IcedTeaPlugin.cc: Handle memory address->string encoding correctly
+	depending on arch/word size.
+	* plugin/icedtea/netscape/javascript/JSObject.java: Use only long for
+	internal variable, to be on the safe side.
+	* plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java: Ditto.
+	* plugin/icedtea/sun/applet/PluginAppletViewer.java: Rewrite
+	network->local image cache mapping code to prevent freezes on certain
+	sites. Add support for java_code, java_codebase, etc.
+	* plugin/icedtea/sun/applet/PluginMessageHandlerWorker.java: Fix race
+	condition that froze the vm under the right circumstances.
+	* rt/net/sourceforge/jnlp/NetxPanel.java: Provide function to return the
+	applet classloader.
+
 2008-11-18  Deepak Bhole  <dbhole at redhat.com>
 	* IcedTeaPlugin.cc: Encode newline characters instead of stripping them.
 	* plugin/icedtea/sun/applet/PluginAppletSecurityContext.java: Minor debug
diff -r ff7010bc3cae -r 85921aeaed32 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc	Tue Nov 18 11:04:46 2008 -0500
+++ b/IcedTeaPlugin.cc	Fri Nov 21 11:39:51 2008 -0500
@@ -193,6 +193,7 @@ inline suseconds_t get_time_in_ms()
 
 	return tv.tv_usec;
 }
+
 
 inline long get_time_in_s()
 {
@@ -342,14 +343,11 @@ static gboolean plugin_in_pipe_callback 
 #include <queue>
 #include <nsCOMPtr.h>
 #include <nsIThread.h>
+#include <nspr.h>
 
 PRMonitor *jvmMsgQueuePRMonitor;
 std::queue<nsCString> jvmMsgQueue;
 nsCOMPtr<nsIThread> processThread;
-
-#include <nspr.h>
-
-#include <prtypes.h>
 
 // IcedTeaJNIEnv helpers.
 class JNIReference
@@ -700,9 +698,10 @@ char const* TYPES[10] = { "Object",
 //   printf ("RECEIVE_BOOLEAN: %s result: %x = %s\n",              \
 //           __func__, result, *result ? "true" : "false");
 
-#include <nscore.h>
 #include <nsISupports.h>
 #include <nsIFactory.h>
+#include <nscore.h>
+#include <prtypes.h>
 
 // Factory functions.
 extern "C" NS_EXPORT nsresult NSGetFactory (nsISupports* aServMgr,
@@ -901,7 +900,33 @@ ResultContainer::stop_timer()
 #include <nsILiveconnect.h>
 #include <nsICollection.h>
 #include <nsIProcess.h>
-#include <map>
+
+#ifndef __STDC_FORMAT_MACROS
+# define __STDC_FORMAT_MACROS
+#endif
+
+#include <inttypes.h>
+
+inline void js_id_to_string(char** str, PLUGIN_JAVASCRIPT_TYPE jsid)
+{
+	if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == 4)
+		sprintf(*str, "%"PRId32, jsid);
+
+	if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == 8)
+		sprintf(*str, "%"PRId64, jsid);
+}
+
+inline PLUGIN_JAVASCRIPT_TYPE string_to_js_id(nsCString str)
+{
+	if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == sizeof(int))
+		return atoi(str.get());
+
+	if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == sizeof(long))
+		return atol(str.get());
+
+	if (sizeof(PLUGIN_JAVASCRIPT_TYPE) == sizeof(long long))
+		return atoll(str.get());
+}
 
 class IcedTeaJNIEnv;
 
@@ -988,7 +1013,7 @@ private:
   PRUint32 next_instance_identifier;
   PRUint32 object_identifier_return;
   PRUint32 instance_count;
-  int javascript_identifier;
+  PLUGIN_JAVASCRIPT_TYPE javascript_identifier;
   int name_identifier;
   int args_identifier;
   int string_identifier;
@@ -1334,7 +1359,6 @@ private:
 #include <nsPIPluginInstancePeer.h>
 #include <nsIPluginInstanceOwner.h>
 #include <nsIRunnable.h>
-#include <iostream>
 
 class IcedTeaRunnable : public nsIRunnable
 {
@@ -2912,8 +2936,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING GetMember\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring nameID = Substring (rest, space + 1);
           name_identifier = nameID.ToInteger (&conversionResult);
           PLUGIN_CHECK ("parse name id", conversionResult);
@@ -2930,8 +2954,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING SetMember\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring nameAndValue = Substring (rest, space + 1);
           space = nameAndValue.FindChar (' ');
           nsDependentCSubstring nameID = Substring (nameAndValue, 0, space);
@@ -2954,8 +2978,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING GetSlot\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring indexStr = Substring (rest, space + 1);
           slot_index = indexStr.ToInteger (&conversionResult);
           PLUGIN_CHECK ("parse name id", conversionResult);
@@ -2972,8 +2996,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING SetSlot\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring nameAndValue = Substring (rest, space + 1);
           space = nameAndValue.FindChar (' ');
           nsDependentCSubstring indexStr = Substring (nameAndValue, 0, space);
@@ -2995,8 +3019,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING Eval\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring stringID = Substring (rest, space + 1);
           string_identifier = stringID.ToInteger (&conversionResult);
           PLUGIN_CHECK ("parse string id", conversionResult);
@@ -3013,8 +3037,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING RemoveMember\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring nameID = Substring (rest, space + 1);
           name_identifier = nameID.ToInteger (&conversionResult);
           PLUGIN_CHECK ("parse name id", conversionResult);
@@ -3031,8 +3055,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
           PLUGIN_DEBUG_0ARG ("POSTING Call\n");
           space = rest.FindChar (' ');
           nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = javascriptID.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) javascriptID);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
           nsDependentCSubstring nameAndArgs = Substring (rest, space + 1);
           space = nameAndArgs.FindChar (' ');
           nsDependentCSubstring nameID = Substring (nameAndArgs, 0, space);
@@ -3052,9 +3076,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
       else if (command == "Finalize")
         {
           PLUGIN_DEBUG_0ARG ("POSTING Finalize\n");
-          nsDependentCSubstring javascriptID = Substring (rest, 0, space);
-          javascript_identifier = rest.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) rest);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
 
           nsCOMPtr<nsIRunnable> event =
             new IcedTeaRunnableMethod<IcedTeaPluginFactory>
@@ -3066,8 +3089,8 @@ IcedTeaPluginFactory::HandleMessage (nsC
       else if (command == "ToString")
         {
           PLUGIN_DEBUG_0ARG ("POSTING ToString\n");
-          javascript_identifier = rest.ToInteger (&conversionResult);
-          PLUGIN_CHECK ("parse javascript id", conversionResult);
+          javascript_identifier = string_to_js_id ((nsCString) rest);
+          PLUGIN_DEBUG_1ARG ("parse javascript id %ld\n", javascript_identifier);
 
           nsCOMPtr<nsIRunnable> event =
             new IcedTeaRunnableMethod<IcedTeaPluginFactory>
@@ -3896,18 +3919,24 @@ IcedTeaPluginInstance::GetWindow ()
                                                NULL, 0, NULL,
                                                &liveconnect_window);
       PLUGIN_CHECK ("get window", result);
-      PLUGIN_DEBUG_1ARG ("HERE 24: %d\n", liveconnect_window);
+      PLUGIN_DEBUG_1ARG ("HERE 24: %ld\n", liveconnect_window);
     }
 
-  PLUGIN_DEBUG_1ARG ("HERE 20: %d\n", liveconnect_window);
+  PLUGIN_DEBUG_1ARG ("HERE 20: %ld\n", liveconnect_window);
+
+  char *windowAddr;
+  windowAddr = (char*) malloc(20*sizeof(char));
+  js_id_to_string(&windowAddr, liveconnect_window);
 
   nsCString message ("context ");
   message.AppendInt (0);
   message += " ";
   message += "JavaScriptGetWindow";
   message += " ";
-  message.AppendInt ((PRUintn) liveconnect_window);
+  message += windowAddr;
   factory->SendMessageToAppletViewer (message);
+
+  free(windowAddr);
 }
 
 IcedTeaPluginInstance::~IcedTeaPluginInstance ()
@@ -4410,7 +4439,6 @@ NS_IMPL_ISUPPORTS1 (IcedTeaJNIEnv, nsISe
 #include <nsITransport.h>
 #include <nsNetCID.h>
 #include <nsServiceManagerUtils.h>
-#include <iostream>
 #include <nsIPrincipal.h>
 #include <nsIScriptSecurityManager.h>
 #include <nsIURI.h>
@@ -4628,7 +4656,7 @@ IcedTeaJNIEnv::ValueString (jni_type typ
       retstr.AppendInt (value.i);
       break;
     case jlong_type:
-      retstr.AppendInt ((PRUintn) value.j);
+      retstr += IcedTeaPrintfCString ("%ld", value.j);
       break;
     case jfloat_type:
       retstr += IcedTeaPrintfCString ("%f", value.f);
@@ -4757,7 +4785,7 @@ IcedTeaJNIEnv::ExpandArgs (JNIID* id, jv
           retstr.AppendInt (args[arg].i);
           break;
         case 'J':
-          retstr.AppendInt ((PRUintn) args[arg].j);
+          retstr += IcedTeaPrintfCString ("%ld", args[arg].j);
           break;
         case 'F':
           retstr += IcedTeaPrintfCString ("%f", args[arg].f);
diff -r ff7010bc3cae -r 85921aeaed32 plugin/icedtea/netscape/javascript/JSObject.java
--- a/plugin/icedtea/netscape/javascript/JSObject.java	Tue Nov 18 11:04:46 2008 -0500
+++ b/plugin/icedtea/netscape/javascript/JSObject.java	Fri Nov 21 11:39:51 2008 -0500
@@ -86,8 +86,7 @@ import sun.applet.PluginDebug;
  */
 public final class JSObject {
     /* the internal object data */
-    private int                               internal;
-    private long                              long_internal;
+    private long                              internal;
 
     /**
      * initialize
@@ -111,7 +110,7 @@ public final class JSObject {
 
     public JSObject(long jsobj_addr) {
         PluginDebug.debug ("JSObject long CONSTRUCTOR");
-        long_internal = jsobj_addr;
+        internal = jsobj_addr;
     }
 
     /**
@@ -231,7 +230,7 @@ public final class JSObject {
     {
         PluginDebug.debug("JSObject.getWindow");
         // FIXME: handle long case as well.
-        int internal = 0;
+        long internal = 0;
         internal = ((PluginAppletViewer)
                     applet.getAppletContext()).getWindow();
         PluginDebug.debug ("GOT IT: " + internal);
diff -r ff7010bc3cae -r 85921aeaed32 plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java
--- a/plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java	Tue Nov 18 11:04:46 2008 -0500
+++ b/plugin/icedtea/sun/applet/GetWindowPluginCallRequest.java	Fri Nov 21 11:39:51 2008 -0500
@@ -44,7 +44,7 @@ import java.security.ProtectionDomain;
 
 public class GetWindowPluginCallRequest extends PluginCallRequest {
     // FIXME: look into int vs long JavaScript internal values.
-    int internal;
+    long internal;
 
     public GetWindowPluginCallRequest(String message, String returnString) {
         super(message, returnString);
@@ -55,7 +55,7 @@ public class GetWindowPluginCallRequest 
         String[] args = message.split(" ");
         // FIXME: add thread ID to messages to support multiple
         // threads using the netscape.javascript package.
-        internal = Integer.parseInt(args[1]);
+        internal = Long.parseLong(args[1]);
         setDone(true);
     }
     
@@ -69,7 +69,7 @@ public class GetWindowPluginCallRequest 
     	return message.contains("JavaScriptGetWindow");
     }
 
-    public Integer getObject() {
+    public Long getObject() {
     	return this.internal;
     }
 }
diff -r ff7010bc3cae -r 85921aeaed32 plugin/icedtea/sun/applet/PluginAppletViewer.java
--- a/plugin/icedtea/sun/applet/PluginAppletViewer.java	Tue Nov 18 11:04:46 2008 -0500
+++ b/plugin/icedtea/sun/applet/PluginAppletViewer.java	Fri Nov 21 11:39:51 2008 -0500
@@ -139,8 +139,6 @@ import sun.misc.Ref;
      
      private double proposedHeightFactor;
      private double proposedWidthFactor;
-     
-     private JNLPClassLoader pluginCL; 
 
      /**
       * Null constructor to allow instantiation via newInstance()
@@ -287,9 +285,6 @@ import sun.misc.Ref;
     	this.streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
     	return;
     }
-
-    if (panel instanceof NetxPanel)
-        pluginCL = (JNLPClassLoader) panel.getApplet().getClass().getClassLoader();
 
     PluginDebug.debug("Applet initialized");
 
@@ -607,23 +602,21 @@ import sun.misc.Ref;
          
          try {
 
-             // wait till aplet initializes
-             while (pluginCL == null) {
-                 PluginDebug.debug("Plugin CL is null. Waiting in getCachedImageRef()..");
-             }
-
              String originalURL = url.toString();
-             String codeBase = pluginCL.getJNLPFile().getCodeBase().toString();
-
-             if (originalURL.startsWith("http")) {
+             String codeBase = panel.getCodeBase().toString();
+
+             if (originalURL.startsWith(codeBase)) {
+
                  PluginDebug.debug("getCachedImageRef() got URL = " + url);
-                 PluginDebug.debug("getCachedImageRef() plugin codebase = " + pluginCL.getJNLPFile().getCodeBase().toString());
-
-                 URL localURL = null;
-                 if (originalURL.startsWith(codeBase))
-                     localURL = pluginCL.getResource(originalURL.substring(codeBase.length()));
-
-                 url = localURL != null ? localURL : url;
+                 PluginDebug.debug("getCachedImageRef() plugin codebase = " + codeBase);
+
+                 // try to fetch it locally
+                 if (panel instanceof NetxPanel) {
+                     URL localURL = null;
+                     localURL = ((NetxPanel) panel).getAppletClassLoader().getResource(originalURL.substring(codeBase.length()));
+
+                     url = localURL != null ? localURL : url;
+                 }
              }
 
              PluginDebug.debug("getCachedImageRef() getting img from URL = " + url);
@@ -740,7 +733,7 @@ import sun.misc.Ref;
  	}
      }
  
-     public int getWindow() {
+     public long getWindow() {
     	 PluginDebug.debug ("STARTING getWindow");
     	 PluginCallRequest request = requestFactory.getPluginCallRequest("window",
     			 							"instance " + identifier + " " + "GetWindow", 
@@ -753,7 +746,7 @@ import sun.misc.Ref;
     		 PluginDebug.debug ("wait request 1");
     		 synchronized(request) {
     			 PluginDebug.debug ("wait request 2");
-    			 while ((Integer) request.getObject() == 0)
+    			 while ((Long) request.getObject() == 0)
     				 request.wait();
     			 PluginDebug.debug ("wait request 3");
     		 }
@@ -763,11 +756,11 @@ import sun.misc.Ref;
     	 }
 
     	 PluginDebug.debug ("STARTING getWindow DONE");
-    	 return (Integer) request.getObject();
+    	 return (Long) request.getObject();
      }
  
      // FIXME: make private, access via reflection.
-     public static Object getMember(int internal, String name)
+     public static Object getMember(long internal, String name)
      {
     	 AppletSecurityContextManager.getSecurityContext(0).store(name);
          int nameID = AppletSecurityContextManager.getSecurityContext(0).getIdentifier(name);
@@ -794,7 +787,7 @@ import sun.misc.Ref;
          return request.getObject();
      }
  
-     public static void setMember(int internal, String name, Object value) {
+     public static void setMember(long internal, String name, Object value) {
     	 AppletSecurityContextManager.getSecurityContext(0).store(name);
          int nameID = AppletSecurityContextManager.getSecurityContext(0).getIdentifier(name);
          AppletSecurityContextManager.getSecurityContext(0).store(value);
@@ -823,7 +816,7 @@ import sun.misc.Ref;
      }
  
      // FIXME: handle long index as well.
-     public static void setSlot(int internal, int index, Object value) {
+     public static void setSlot(long internal, int index, Object value) {
     	 AppletSecurityContextManager.getSecurityContext(0).store(value);
          int valueID = AppletSecurityContextManager.getSecurityContext(0).getIdentifier(value);
  
@@ -848,7 +841,7 @@ import sun.misc.Ref;
          PluginDebug.debug (" setSlot DONE");
      }
  
-     public static Object getSlot(int internal, int index)
+     public static Object getSlot(long internal, int index)
      {
          // Prefix with dummy instance for convenience.
          PluginCallRequest request = requestFactory.getPluginCallRequest("member", 
@@ -872,7 +865,7 @@ import sun.misc.Ref;
          return request.getObject();
      }
  
-     public static Object eval(int internal, String s)
+     public static Object eval(long internal, String s)
      {
     	 AppletSecurityContextManager.getSecurityContext(0).store(s);
          int stringID = AppletSecurityContextManager.getSecurityContext(0).getIdentifier(s);
@@ -899,7 +892,7 @@ import sun.misc.Ref;
          return request.getObject();
      }
  
-     public static void removeMember (int internal, String name) {
+     public static void removeMember (long internal, String name) {
     	 AppletSecurityContextManager.getSecurityContext(0).store(name);
          int nameID = AppletSecurityContextManager.getSecurityContext(0).getIdentifier(name);
  
@@ -924,7 +917,7 @@ import sun.misc.Ref;
          PluginDebug.debug (" RemoveMember DONE");
      }
  
-     public static Object call(int internal, String name, Object args[])
+     public static Object call(long internal, String name, Object args[])
      {
          // FIXME: when is this removed from the object store?
          // FIXME: reference should return the ID.
@@ -956,7 +949,7 @@ import sun.misc.Ref;
          return request.getObject();
      }
  
-     public static void JavaScriptFinalize(int internal)
+     public static void JavaScriptFinalize(long internal)
      {
          // Prefix with dummy instance for convenience.
          PluginCallRequest request = requestFactory.getPluginCallRequest("void",
@@ -979,7 +972,7 @@ import sun.misc.Ref;
          PluginDebug.debug (" finalize DONE");
      }
  
-     public static String javascriptToString(int internal)
+     public static String javascriptToString(long internal)
      {
          // Prefix with dummy instance for convenience.
          PluginCallRequest request = requestFactory.getPluginCallRequest("member",
@@ -1595,6 +1588,28 @@ import sun.misc.Ref;
     						 atts.put("code", ((String) atts.get("classid")).substring(5));
     					 }
 
+                         // java_* aliases override older names:
+                         // http://java.sun.com/j2se/1.4.2/docs/guide/plugin/developer_guide/using_tags.html#in-ie
+                         if (atts.get("java_code") != null) {
+                             atts.put("code", ((String) atts.get("java_code")));
+                         }
+


From dbhole at redhat.com  Fri Nov 21 12:36:19 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Fri, 21 Nov 2008 20:36:19 +0000
Subject: changeset in /hg/icedtea6: Merge with upstream
Message-ID: <hg.16d57d401734.1227299779.2873452341184383832@icedtea.classpath.org>

changeset 16d57d401734 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=16d57d401734
description:
	Merge with upstream

diffstat:

7 files changed, 42 insertions(+), 11 deletions(-)
ChangeLog                                              |   21 ++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp        |    8 ++++--
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp      |    2 -
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp      |    8 +++---
ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp |    8 +++++-
ports/hotspot/src/share/vm/shark/sharkFunction.cpp     |    2 -
ports/hotspot/src/share/vm/shark/sharkValue.hpp        |    4 +--

diffs (169 lines):

diff -r 85921aeaed32 -r 16d57d401734 ChangeLog
--- a/ChangeLog	Fri Nov 21 11:39:51 2008 -0500
+++ b/ChangeLog	Fri Nov 21 15:23:16 2008 -0500
@@ -11,6 +11,27 @@ 2008-11-21  Deepak Bhole  <dbhole at redhat
 	condition that froze the vm under the right circumstances.
 	* rt/net/sourceforge/jnlp/NetxPanel.java: Provide function to return the
 	applet classloader.
+
+2008-11-21 Andrew Haley <aph at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp
+	(class SharkComputableValue): Use IRBuilder<>, not IRBuilder.
+	(class SharkValue): Use IRBuilder<>, not IRBuilder.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp
+	(SharkFunction::CreatePopFrame): Change a few jint_types to
+	intptr_types.
+	* ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
+	(SharkConstantPool::cache_entry_at): Byte-swap the cache index.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+	(SharkBuilder::SharkBuilder) Inherit from template class
+	IRBuilder<>.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp:
+	(SharkBuilder::SharkBuilder) Inherit from template class
+	IRBuilder<>.
+	Change a few jint_types to intptr_types.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp
+	(SharkBlock::get_interface_callee): Change a few jint_types to
+	intptr_types.
 
 2008-11-18  Deepak Bhole  <dbhole at redhat.com>
 	* IcedTeaPlugin.cc: Encode newline characters instead of stripping them.
diff -r 85921aeaed32 -r 16d57d401734 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Nov 21 11:39:51 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Fri Nov 21 15:23:16 2008 -0500
@@ -1814,6 +1814,8 @@ Value* SharkBlock::get_interface_callee(
     in_ByteSize(instanceKlass::vtable_length_offset() * HeapWordSize),
     SharkType::jint_type(),
     "vtable_length");
+  vtable_length =
+    builder()->CreateIntCast(vtable_length, SharkType::intptr_type(), false);
 
   bool needs_aligning = HeapWordsPerLong > 1;
   const char *itable_start_name = "itable_start";
@@ -1821,7 +1823,7 @@ Value* SharkBlock::get_interface_callee(
     vtable_start,
     builder()->CreateShl(
       vtable_length,
-      LLVMValue::jint_constant(exact_log2(vtableEntry::size() * wordSize))),
+      LLVMValue::intptr_constant(exact_log2(vtableEntry::size() * wordSize))),
     needs_aligning ? "" : itable_start_name);
   if (needs_aligning)
     itable_start = builder()->CreateAlign(
@@ -1878,6 +1880,8 @@ Value* SharkBlock::get_interface_callee(
     in_ByteSize(itableOffsetEntry::offset_offset_in_bytes()),
     SharkType::jint_type(),
     "offset");
+  offset =
+    builder()->CreateIntCast(offset, SharkType::intptr_type(), false);
 
   Value *index = builder()->CreateValueOfStructEntry(
     cache, ConstantPoolCacheEntry::f2_offset(),
@@ -1894,7 +1898,7 @@ Value* SharkBlock::get_interface_callee(
             offset),
           builder()->CreateShl(
             index,
-            LLVMValue::jint_constant(
+            LLVMValue::intptr_constant(
               exact_log2(itableMethodEntry::size() * wordSize)))),
         LLVMValue::intptr_constant(
           itableMethodEntry::method_offset_in_bytes())),
diff -r 85921aeaed32 -r 16d57d401734 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Nov 21 11:39:51 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Fri Nov 21 15:23:16 2008 -0500
@@ -29,7 +29,7 @@ using namespace llvm;
 using namespace llvm;
 
 SharkBuilder::SharkBuilder()
-  : IRBuilder(),
+  : IRBuilder<>(),
       _module("shark"),
       _module_provider(module()),
       _execution_engine(ExecutionEngine::create(&_module_provider))
diff -r 85921aeaed32 -r 16d57d401734 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Fri Nov 21 11:39:51 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Fri Nov 21 15:23:16 2008 -0500
@@ -23,7 +23,7 @@
  *
  */
 
-class SharkBuilder : public llvm::IRBuilder {
+class SharkBuilder : public llvm::IRBuilder<> {
  public:
   SharkBuilder();
 
@@ -81,13 +81,13 @@ class SharkBuilder : public llvm::IRBuil
                                   llvm::Value*      index,
                                   const char*       name = "")
   {
-    llvm::Value* offset = index;
+    llvm::Value* offset = CreateIntCast(index, SharkType::intptr_type(), false);
     if (element_bytes != 1)
       offset = CreateShl(
         offset,
-        LLVMValue::jint_constant(exact_log2(element_bytes)));
+        LLVMValue::intptr_constant(exact_log2(element_bytes)));
     offset = CreateAdd(
-      LLVMValue::jint_constant(in_bytes(base_offset)), offset);
+      LLVMValue::intptr_constant(in_bytes(base_offset)), offset);
 
     return CreateIntToPtr(
       CreateAdd(CreatePtrToInt(arrayoop, SharkType::intptr_type()), offset),
diff -r 85921aeaed32 -r 16d57d401734 ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp	Fri Nov 21 11:39:51 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp	Fri Nov 21 15:23:16 2008 -0500
@@ -82,6 +82,12 @@ Value *SharkConstantPool::tag_at(int whi
 
 Value *SharkConstantPool::cache_entry_at(int which)
 {
+  // Takes a constant pool cache index in byte-swapped byte order
+  // (which comes from the bytecodes after rewriting).  This is a
+  // bizarre hack but it's the same as
+  // constantPoolOopDesc::field_or_method_at().
+  which = Bytes::swap_u2(which);
+
   Value *entry = builder()->CreateIntToPtr(
     builder()->CreateAdd(
       builder()->CreatePtrToInt(
@@ -109,7 +115,7 @@ Value *SharkConstantPool::cache_entry_at
       builder()->CreateValueOfStructEntry(
         entry, ConstantPoolCacheEntry::indices_offset(),
         SharkType::intptr_type()),
-      LLVMValue::jint_constant(shift)),
+      LLVMValue::intptr_constant(shift)),
     LLVMValue::intptr_constant(0xff));
 
   BasicBlock *orig_block = builder()->GetInsertBlock();
diff -r 85921aeaed32 -r 16d57d401734 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Nov 21 11:39:51 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Fri Nov 21 15:23:16 2008 -0500
@@ -182,7 +182,7 @@ Value* SharkFunction::CreatePopFrame(int
   Value *fp = CreateLoadZeroFramePointer();
   Value *sp = builder()->CreateAdd(
     fp,
-    LLVMValue::jint_constant((1 + locals_to_pop) * wordSize));
+    LLVMValue::intptr_constant((1 + locals_to_pop) * wordSize));
 
   CreateStoreZeroStackPointer(sp);
   CreateStoreZeroFramePointer(
diff -r 85921aeaed32 -r 16d57d401734 ports/hotspot/src/share/vm/shark/sharkValue.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Fri Nov 21 11:39:51 2008 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkValue.hpp	Fri Nov 21 15:23:16 2008 -0500
@@ -246,7 +246,7 @@ class SharkValue : public ResourceObj {
   {
     ShouldNotCallThis();
   }
-  virtual llvm::Value* intptr_value(llvm::IRBuilder* builder) const
+  virtual llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const
   {
     ShouldNotCallThis();
   }
@@ -370,7 +370,7 @@ class SharkComputableValue : public Shar
   {
     return llvm_value();
   }
-  llvm::Value* intptr_value(llvm::IRBuilder* builder) const
+  llvm::Value* intptr_value(llvm::IRBuilder<>* builder) const
   {
     assert(is_jobject(), "should be");
     return builder->CreatePtrToInt(llvm_value(), SharkType::intptr_type());


From mark at klomp.org  Fri Nov 21 13:49:16 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 21 Nov 2008 21:49:16 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-stroker-finish.patc...
Message-ID: <hg.b8307e2d80a5.1227304156.2873452341184383832@icedtea.classpath.org>

changeset b8307e2d80a5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b8307e2d80a5
description:
	* patches/icedtea-stroker-finish.patch: New patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.
		* HACKING: Document new patch.

diffstat:

4 files changed, 30 insertions(+)
ChangeLog                            |    7 +++++++
HACKING                              |    2 ++
Makefile.am                          |    1 +
patches/icedtea-stroker-finish.patch |   20 ++++++++++++++++++++

diffs (62 lines):

diff -r 16d57d401734 -r b8307e2d80a5 ChangeLog
--- a/ChangeLog	Fri Nov 21 15:23:16 2008 -0500
+++ b/ChangeLog	Fri Nov 21 22:48:56 2008 +0100
@@ -1,4 +1,11 @@ 2008-11-21  Deepak Bhole  <dbhole at redhat
+2008-11-21  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-stroker-finish.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* HACKING: Document new patch.
+
 2008-11-21  Deepak Bhole  <dbhole at redhat.com>
+
 	* IcedTeaPlugin.cc: Handle memory address->string encoding correctly
 	depending on arch/word size.
 	* plugin/icedtea/netscape/javascript/JSObject.java: Use only long for
diff -r 16d57d401734 -r b8307e2d80a5 HACKING
--- a/HACKING	Fri Nov 21 15:23:16 2008 -0500
+++ b/HACKING	Fri Nov 21 22:48:56 2008 +0100
@@ -63,6 +63,8 @@ The following patches are currently appl
 * icedtea-alt-jar.patch: Add support for using an alternate jar tool in JDK building. 
 * icedtea-hotspot7-tests.patch: Adds hotspot compiler tests from jdk7 tree.
 * icedtea-renderer-crossing.patch: Check whether crossing is initialized in Pisces Renderer.
+* icedtea-stroker-finish.patch: Make sure cap calculation doesn't result in
+  divide by zero on tiny paths.
 * icedtea-alsa-default-device.patch: Fix problems with using the ALSA 'default' device.
 * icedtea-linker-libs-order.patch: When linking, put the referenced libraries after the object files (PR237).
 * icedtea-f2i-overflow.patch: Replaces the code used by [fd]2[il] bytecodes to correctly handle overflows. (PR244)
diff -r 16d57d401734 -r b8307e2d80a5 Makefile.am
--- a/Makefile.am	Fri Nov 21 15:23:16 2008 -0500
+++ b/Makefile.am	Fri Nov 21 22:48:56 2008 +0100
@@ -533,6 +533,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-javac-debuginfo.patch \
 	patches/icedtea-xjc.patch \
 	patches/icedtea-renderer-crossing.patch \
+	patches/icedtea-stroker-finish.patch \
 	patches/icedtea-alsa-default-device.patch \
 	patches/icedtea-linker-libs-order.patch \
 	patches/icedtea-f2i-overflow.patch \
diff -r 16d57d401734 -r b8307e2d80a5 patches/icedtea-stroker-finish.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-stroker-finish.patch	Fri Nov 21 22:48:56 2008 +0100
@@ -0,0 +1,20 @@
+--- openjdk6/jdk/src/share/classes/sun/java2d/pisces/Stroker.java
++++ openjdk/jdk/src/share/classes/sun/java2d/pisces/Stroker.java
+@@ -695,7 +695,7 @@
+             long ldx = (long)(px0 - x0);
+             long ldy = (long)(py0 - y0);
+             long llen = lineLength(ldx, ldy);
+-            long s = (long)lineWidth2*65536/llen;
++            long s = (llen == 0) ? 0 : (long)lineWidth2*65536/llen;
+ 
+             int capx = x0 - (int)(ldx*s >> 16);
+             int capy = y0 - (int)(ldy*s >> 16);
+@@ -717,7 +717,7 @@
+             long ldx = (long)(sx1 - sx0);
+             long ldy = (long)(sy1 - sy0);
+             long llen = lineLength(ldx, ldy);
+-            long s = (long)lineWidth2*65536/llen;
++            long s = (llen == 0) ? 0 : (long)lineWidth2*65536/llen;
+ 
+             int capx = sx0 - (int)(ldx*s >> 16);
+             int capy = sy0 - (int)(ldy*s >> 16);


From mark at klomp.org  Fri Nov 21 13:51:54 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 21 Nov 2008 22:51:54 +0100
Subject: Bug in pisces Stroker (div by zero)
Message-ID: <1227304315.9475.12.camel@hermans.wildebeest.org>

Hi,

There is a bug in the pisces Stroker in finish(). When ldx and ldy are
so small (zero) that lineLength() will return zero, then you will get a
div by zero exception.

You can see this with for example this webstart application (you will
need to have IcedTeaWebstart [netx] installed):
http://linuxhippy.blogspot.com/2008/11/jgears2-rendermark.html

java.lang.ArithmeticException: / by zero
  at sun.java2d.pisces.Stroker.finish(Stroker.java:698)
  at sun.java2d.pisces.Stroker.close(Stroker.java:592)
  at sun.java2d.pisces.PiscesRenderingEngine.pathTo(PiscesRenderingEngine.java:248)
  at sun.java2d.pisces.PiscesRenderingEngine.strokeTo(PiscesRenderingEngine.java:231)
  at sun.java2d.pisces.PiscesRenderingEngine.strokeTo(PiscesRenderingEngine.java:181)
  at sun.java2d.pisces.PiscesRenderingEngine.strokeTo(PiscesRenderingEngine.java:145)
  at sun.java2d.pipe.LoopPipe.getStrokeSpans(LoopPipe.java:274)
  at sun.java2d.x11.X11Renderer.draw(X11Renderer.java:343)
  at sun.java2d.pipe.ValidatePipe.draw(ValidatePipe.java:154)
  at sun.java2d.SunGraphics2D.draw(SunGraphics2D.java:2392)
  at JGears2.renderShape(JGears2.java:244)
  [...]

Attached is the workaround that I checked into IcedTea to make this work
reliably:

2008-11-21  Mark Wielaard  <mark at klomp.org>

    * patches/icedtea-stroker-finish.patch: New patch.
    * Makefile.am (ICEDTEA_PATCHES): Add new patch.
    * HACKING: Document new patch.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-stroker-finish.patch
Type: text/x-patch
Size: 877 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081121/bf4ac721/icedtea-stroker-finish.patch 

From dbhole at redhat.com  Fri Nov 21 15:35:31 2008
From: dbhole at redhat.com (Deepak Bhole)
Date: Fri, 21 Nov 2008 23:35:31 +0000
Subject: changeset in /hg/icedtea6: Fix a mistake in previous commit re: ...
Message-ID: <hg.9aae858397f9.1227310531.2873452341184383832@icedtea.classpath.org>

changeset 9aae858397f9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9aae858397f9
description:
	Fix a mistake in previous commit re: integer overflow.

diffstat:

2 files changed, 14 insertions(+), 2 deletions(-)
ChangeLog        |    4 ++++
IcedTeaPlugin.cc |   12 ++++++++++--

diffs (68 lines):

diff -r b8307e2d80a5 -r 9aae858397f9 ChangeLog
--- a/ChangeLog	Fri Nov 21 22:48:56 2008 +0100
+++ b/ChangeLog	Fri Nov 21 18:35:27 2008 -0500
@@ -1,3 +1,7 @@ 2008-11-21  Mark Wielaard  <mark at klomp.o
+2008-11-21  Deepak Bhole  <dbhole at redhat.com>
+
+	* IcedTeaPlugin.cc: Fix a mistake in previous commit re: integer overflow.
+
 2008-11-21  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-stroker-finish.patch: New patch.
diff -r b8307e2d80a5 -r 9aae858397f9 IcedTeaPlugin.cc
--- a/IcedTeaPlugin.cc	Fri Nov 21 22:48:56 2008 +0100
+++ b/IcedTeaPlugin.cc	Fri Nov 21 18:35:27 2008 -0500
@@ -4638,6 +4638,7 @@ IcedTeaJNIEnv::ValueString (jni_type typ
   PLUGIN_TRACE_JNIENV ();
   nsCString retstr ("");
 
+  char* longVal = (char*) malloc(sizeof(char)*20);
   switch (type)
     {
     case jboolean_type:
@@ -4656,7 +4657,8 @@ IcedTeaJNIEnv::ValueString (jni_type typ
       retstr.AppendInt (value.i);
       break;
     case jlong_type:
-      retstr += IcedTeaPrintfCString ("%ld", value.j);
+      sprintf(longVal, "%"PRId64, value.j);
+      retstr += longVal;
       break;
     case jfloat_type:
       retstr += IcedTeaPrintfCString ("%f", value.f);
@@ -4672,6 +4674,8 @@ IcedTeaJNIEnv::ValueString (jni_type typ
     default:
       break;
     }
+
+  free(longVal);
 
   // Freed by calling function.
   return strdup (retstr.get ());
@@ -4762,6 +4766,7 @@ IcedTeaJNIEnv::ExpandArgs (JNIID* id, jv
   // Method.
   int arg = 0;
   char* fl;
+  char* longVal = (char*) malloc(sizeof(char)*20);
   while (id->signature[i] != stopchar)
     {
       switch (id->signature[i])
@@ -4785,7 +4790,8 @@ IcedTeaJNIEnv::ExpandArgs (JNIID* id, jv
           retstr.AppendInt (args[arg].i);
           break;
         case 'J':
-          retstr += IcedTeaPrintfCString ("%ld", args[arg].j);
+          sprintf(longVal, "%"PRId64, args[arg].j);
+          retstr += longVal;
           break;
         case 'F':
           retstr += IcedTeaPrintfCString ("%f", args[arg].f);
@@ -4833,6 +4839,8 @@ IcedTeaJNIEnv::ExpandArgs (JNIID* id, jv
 	  arg++;
     }
 
+  free(longVal);
+
   // Freed by calling function.
   return strdup (retstr.get ());
 }


From bugzilla-daemon at icedtea.classpath.org  Sat Nov 22 02:56:28 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 22 Nov 2008 10:56:28 +0000
Subject: [Bug 262] New: Alt Graph doesnot generate any key event when pressing
	in French locale
Message-ID: <E1L3qA8-0005MV-Di@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=262

           Summary: Alt Graph doesnot generate any key event when pressing
                    in French locale
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mercier.eric at gmail.com


FULL PRODUCT VERSION :
java version "1.6.0_0"
IcedTea6 1.3.1 (6b12-Fedora-10) Runtime Environment (build 1.6.0_0-b12)
OpenJDK 64-Bit Server VM (build 1.6.0_0-b12, mixed mode)

ADDITIONAL OS VERSION INFORMATION :
Linux 2.6.27.5-117.fc10.x86_64
(Fedora 10 preview)


In Java applications, "Alt Gr" and therefore third level keys don't work.
Ctrl+Alt+<key> doesn't work either.
This means I cannot write e.g. "\", "{", "}", "[", "]", "~" ...
All in all, I get this problem since I updated ubuntu from 7.10 to 8.04 and
with this from java 6 update 3 to update 6.
I do not have any troubles with "alt gr"  on Windows operating systems as well.

Keyboard is French.

STEPS TO FOLLOW TO REPRODUCE THE PROBLEM :

-Launch: java -jar
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64/demo/jfc/Notepad/Notepad.jar

-Try to write e.g. "\" by pressing <alt gr>+? -- this should not work ...


REPRODUCIBILITY :
This bug can be reproduced always.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Sun Nov 23 09:17:46 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 23 Nov 2008 17:17:46 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-samejvm-safe.patch:...
Message-ID: <hg.b7ce0d293432.1227460666.2873452341184383832@icedtea.classpath.org>

changeset b7ce0d293432 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b7ce0d293432
description:
	* patches/icedtea-samejvm-safe.patch: New patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.
		(check-jdk): Run jtreg with -samevm.
		* HACKING: Document new patch.

diffstat:

4 files changed, 23 insertions(+), 2 deletions(-)
ChangeLog                          |    7 +++++++
HACKING                            |    1 +
Makefile.am                        |    5 +++--
patches/icedtea-samejvm-safe.patch |   12 ++++++++++++

diffs (63 lines):

diff -r d1ff3aff9167 -r b7ce0d293432 ChangeLog
--- a/ChangeLog	Sun Nov 23 17:12:40 2008 +0100
+++ b/ChangeLog	Sun Nov 23 17:46:11 2008 +0100
@@ -1,3 +1,10 @@ 2008-11-23  Mark Wielaard  <mark at klomp.o
+2008-11-23  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-samejvm-safe.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	(check-jdk): Run jtreg with -samevm.
+	* HACKING: Document new patch.
+
 2008-11-23  Mark Wielaard  <mark at klomp.org>
 
 	* test/jtreg/com/sun/javatest/regtest/Main.java
diff -r d1ff3aff9167 -r b7ce0d293432 HACKING
--- a/HACKING	Sun Nov 23 17:12:40 2008 +0100
+++ b/HACKING	Sun Nov 23 17:46:11 2008 +0100
@@ -73,6 +73,7 @@ The following patches are currently appl
   #6761856, swing TextLayout.getBounds() returns shifted bounds.
 * icedtea-display-mode-changer.patch: Add extra test class.
 * icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
+* icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
diff -r d1ff3aff9167 -r b7ce0d293432 Makefile.am
--- a/Makefile.am	Sun Nov 23 17:12:40 2008 +0100
+++ b/Makefile.am	Sun Nov 23 17:46:11 2008 +0100
@@ -540,7 +540,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-cc-interp-no-fer.patch \
 	patches/icedtea-6761856-freetypescaler.patch \
 	patches/icedtea-display-mode-changer.patch \
-	patches/icedtea-testenv.patch
+	patches/icedtea-testenv.patch \
+	patches/icedtea-samejvm-safe.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
@@ -1599,7 +1600,7 @@ check-jdk: stamps/jtreg.stamp
 	mkdir -p test/jdk/JTwork test/jdk/JTreport
 	$(ICEDTEA_BOOT_DIR)/bin/java -jar test/jtreg.jar -v1 -a -ignore:quiet \
 		-w:test/jdk/JTwork -r:test/jdk/JTreport \
-		-jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+		-s -jdk:`pwd`/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 		`pwd`/openjdk/jdk/test \
 	    | tee test/$@.log
 
diff -r d1ff3aff9167 -r b7ce0d293432 patches/icedtea-samejvm-safe.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-samejvm-safe.patch	Sun Nov 23 17:46:11 2008 +0100
@@ -0,0 +1,12 @@
+--- openjdk.orig/jdk/test/TEST.ROOT	2008-11-06 09:44:52.000000000 +0100
++++ openjdk/jdk/test/TEST.ROOT	2008-11-23 16:15:53.000000000 +0100
+@@ -4,3 +4,9 @@
+ 
+ # The list of keywords supported in the entire test suite
+ keys=2d dnd i18n
++
++# List if directory (prefixes) that contain test that are safe to run in
++# -samejvm mode. Only used if the test root (dir containing this file) is
++# given to jtreg and the -samejvm argument is used, ignored otherwise
++# (meaning all tests are assumed to be same jvm safe).
++samejvmsafe=com/sun/crypto com/sun/management com/sun/media com/sun/security java/beans/beancontext java/beans/PropertyChangeSupport java/beans/Statement java/beans/VetoableChangeSupport java/lang/Boolean java/lang/Byte java/lang/Double java/lang/Float java/lang/Integer java/lang/Long java/lang/Short java/lang/Math java/lang/StrictMath java/lang/String java/lang/Throwable java/lang/instrument java/math java/net/URI java/net/URLDecoder java/net/URLEncoder java/nio/Buffer java/nio/ByteOrder java/nio/MappedByteBuffer java/nio/channels/Channels java/nio/channels/DatagramChannel java/nio/channels/spi java/security/cert java/security/Provider java/text java/util/jar java/util/zip java/util/Array java/util/BitSet java/util/Collection java/util/List javax/crypto/Cipher javax/imageio javax/management/openmbean javax/naming javax/rmi javax/sound sun/net/www/protocol sun/misc sun/nio sun/rmi sun/security/pkcs11 sun/security/rsa sun/security/util sun/security/x509 sun/util


From mark at klomp.org  Sun Nov 23 09:17:46 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 23 Nov 2008 17:17:46 +0000
Subject: changeset in /hg/icedtea6: Add same jvm dirs support to jtreg.
Message-ID: <hg.d1ff3aff9167.1227460666.2873452341184383832@icedtea.classpath.org>

changeset d1ff3aff9167 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d1ff3aff9167
description:
	Add same jvm dirs support to jtreg.

	2008-11-23  Mark Wielaard  <mark at klomp.org>

		* test/jtreg/com/sun/javatest/regtest/Main.java
		(createParameters): Set same jvm safe dirs when non-null.
		(getSameJVMSafeDirs): New method that reads samejvmsafe property
		from TEST.ROOT.
		(sameJVMSafeDirs): New private field.
		* test/jtreg/com/sun/javatest/regtest/RegressionParameters.java
		(SAME_JVM_SAFE_DIRS): New static final field.
		(load): Read same jvm safe dirs.
		(save0): Write same jvm safe dirs.
		(getSameJVMSafeDirs): New method.
		(setSameJVMSafeDirs): New method.
		* test/jtreg/com/sun/javatest/regtest/RegressionScript.java
		(run): Set testDirPath.
		(isOtherJVM): Take same jvm safe into account.
		(isSameJVMSafe): New method.
		(testDirPath): New private field.

diffstat:

4 files changed, 100 insertions(+), 1 deletion(-)
ChangeLog                                                     |   19 +++++
test/jtreg/com/sun/javatest/regtest/Main.java                 |   36 ++++++++++
test/jtreg/com/sun/javatest/regtest/RegressionParameters.java |   20 +++++
test/jtreg/com/sun/javatest/regtest/RegressionScript.java     |   26 ++++++-

diffs (200 lines):

diff -r 9aae858397f9 -r d1ff3aff9167 ChangeLog
--- a/ChangeLog	Fri Nov 21 18:35:27 2008 -0500
+++ b/ChangeLog	Sun Nov 23 17:12:40 2008 +0100
@@ -1,3 +1,22 @@ 2008-11-21  Deepak Bhole  <dbhole at redhat
+2008-11-23  Mark Wielaard  <mark at klomp.org>
+
+	* test/jtreg/com/sun/javatest/regtest/Main.java
+	(createParameters): Set same jvm safe dirs when non-null.
+	(getSameJVMSafeDirs): New method that reads samejvmsafe property
+	from TEST.ROOT.
+	(sameJVMSafeDirs): New private field.
+	* test/jtreg/com/sun/javatest/regtest/RegressionParameters.java
+	(SAME_JVM_SAFE_DIRS): New static final field.
+	(load): Read same jvm safe dirs.
+	(save0): Write same jvm safe dirs.
+	(getSameJVMSafeDirs): New method.
+	(setSameJVMSafeDirs): New method.
+	* test/jtreg/com/sun/javatest/regtest/RegressionScript.java
+	(run): Set testDirPath.
+	(isOtherJVM): Take same jvm safe into account.
+	(isSameJVMSafe): New method.
+	(testDirPath): New private field.
+
 2008-11-21  Deepak Bhole  <dbhole at redhat.com>
 
 	* IcedTeaPlugin.cc: Fix a mistake in previous commit re: integer overflow.
diff -r 9aae858397f9 -r d1ff3aff9167 test/jtreg/com/sun/javatest/regtest/Main.java
--- a/test/jtreg/com/sun/javatest/regtest/Main.java	Fri Nov 21 18:35:27 2008 -0500
+++ b/test/jtreg/com/sun/javatest/regtest/Main.java	Sun Nov 23 17:12:40 2008 +0100
@@ -29,6 +29,7 @@ import java.io.BufferedReader;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
@@ -52,6 +53,7 @@ import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.TreeMap;
 
 import com.sun.javatest.CompositeFilter;
@@ -1354,6 +1356,10 @@ public class Main {
             if (ignoreKind != null)
                 rp.setIgnoreKind(ignoreKind);
 
+            sameJVMSafeDirs = getSameJVMSafeDirs(ts);
+            if (sameJVMSafeDirs != null)
+                rp.setSameJVMSafeDirs(sameJVMSafeDirs);
+
             return rp;
         } catch (TestSuite.Fault f) {
             f.printStackTrace();
@@ -1372,6 +1378,35 @@ public class Main {
         } catch (IOException e) {
             return file.getAbsoluteFile();
         }
+    }
+
+    // Returns directory (prefix) for tests that are same jvm safe
+    // read from amejvmsafe property in TEST.ROOT file. Returning null
+    // means all tests are considered same jvm safe. null is returned
+    // when there is no samejvmsafe property, or there was a problem
+    // reading it, and when anything else than the test root was given
+    // as test file argument. Meaning that this only returns something
+    // non-null if anything was actually specified as same jvm safe and
+    // the whole test suite is being tested.
+    private List<String> getSameJVMSafeDirs(File testRoot) {
+	// Only use the same jvm safe dirs when running from the root.
+	if (testFileArgs.size() != 1
+	    || !canon(testFileArgs.iterator().next()).equals(canon(testRoot)))
+	    return null;
+
+	try {
+	    File file = new File(testRoot, "TEST.ROOT");
+            if (file.exists()) {
+		Properties testRootProps = new Properties();
+		testRootProps.load(new FileInputStream(file));
+		String safedirs = testRootProps.getProperty("samejvmsafe");
+		if ((safedirs != null) && (safedirs.trim().length() > 0))
+		    return Arrays.asList(StringArray.splitWS(safedirs));
+	    }
+	} catch (IOException ioe) {
+	    // Bah, then just assume everything is safe.
+	}
+	return null;
     }
 
     private String getRelativePath(File base, File f) {
@@ -1762,6 +1797,7 @@ public class Main {
     // these args are jtreg extras
     private File baseDirArg;
     private boolean sameJVMFlag;
+    private List<String> sameJVMSafeDirs;
     private JDK jdk;
     private boolean guiFlag;
     private boolean reportOnlyFlag;
diff -r 9aae858397f9 -r d1ff3aff9167 test/jtreg/com/sun/javatest/regtest/RegressionParameters.java
--- a/test/jtreg/com/sun/javatest/regtest/RegressionParameters.java	Fri Nov 21 18:35:27 2008 -0500
+++ b/test/jtreg/com/sun/javatest/regtest/RegressionParameters.java	Sun Nov 23 17:12:40 2008 +0100
@@ -139,6 +139,7 @@ public class RegressionParameters
     private static final String TEST_JAVA_OPTIONS = ".testJavaOpts";
     private static final String IGNORE = ".ignore";
     private static final String RETAIN_ARGS = ".retain";
+    private static final String SAME_JVM_SAFE_DIRS = ".samejvmsafedirs";
     
     @Override
     public void load(Map data, boolean checkChecksum) throws Interview.Fault {
@@ -182,6 +183,10 @@ public class RegressionParameters
         v = (String) data.get(prefix + RETAIN_ARGS);
         if (v != null)
             setRetainArgs(Arrays.asList(StringArray.splitSeparator("\n", v)));
+
+        v = (String) data.get(prefix + SAME_JVM_SAFE_DIRS);
+        if (v != null)
+            setSameJVMSafeDirs(Arrays.asList(StringArray.splitSeparator("\n", v)));
     }
     
     @SuppressWarnings("unchecked")
@@ -203,6 +208,9 @@ public class RegressionParameters
         
         if (jdk != null)
             data.put(prefix + JDK, jdk.getPath());
+        
+        if (sameJVMSafeDirs != null)
+            data.put(prefix + SAME_JVM_SAFE_DIRS, StringUtils.join(sameJVMSafeDirs, "\n"));
         
         if (retainArgs != null)
             data.put(prefix + RETAIN_ARGS, StringUtils.join(retainArgs, "\n"));
@@ -592,6 +600,18 @@ public class RegressionParameters
     private Pattern retainFilesPattern;
 
     //---------------------------------------------------------------------
+    
+    List<String> getSameJVMSafeDirs() {
+        return sameJVMSafeDirs;
+    }
+    
+    void setSameJVMSafeDirs(List<String> sameJVMSafeDirs) {
+        this.sameJVMSafeDirs= sameJVMSafeDirs;
+    }
+
+    private List<String> sameJVMSafeDirs;
+
+    //---------------------------------------------------------------------
 
     private static final String PATHSEP  = System.getProperty("path.separator");
     private static final String LINESEP  = System.getProperty("line.separator");
diff -r 9aae858397f9 -r d1ff3aff9167 test/jtreg/com/sun/javatest/regtest/RegressionScript.java
--- a/test/jtreg/com/sun/javatest/regtest/RegressionScript.java	Fri Nov 21 18:35:27 2008 -0500
+++ b/test/jtreg/com/sun/javatest/regtest/RegressionScript.java	Sun Nov 23 17:12:40 2008 +0100
@@ -69,6 +69,10 @@ public class RegressionScript extends Sc
     public Status run(String[] argv, TestDescription td, TestEnvironment env) {
         if (!(env instanceof RegressionEnvironment))
             throw new AssertionError();
+
+	String testFilePath = td.getRootRelativePath();
+	int lastSlash = testFilePath.lastIndexOf('/');
+	testDirPath = testFilePath.substring(0, lastSlash);
         
         regEnv = (RegressionEnvironment) env;
         params = regEnv.params;
@@ -833,7 +837,26 @@ public class RegressionScript extends Sc
     }
 
     boolean isOtherJVM() {
-        return params.isOtherJVM();
+	boolean samevm = !params.isOtherJVM();
+	if (samevm)
+	    return !isSameJVMSafe();
+	else
+	    return true;
+    }
+
+    // Whether the actions of this script can safely run in the same jvm.
+    // No same jvm safe dirs given means they are all assumed safe.
+    // If our actions come from a file in a subdir of a safe dir that is ok.
+    boolean isSameJVMSafe() {
+        List<String> dirs = params.getSameJVMSafeDirs();
+	if (dirs == null)
+	    return true;
+
+	for (String dir : dirs)
+	    if (testDirPath.startsWith(dir))
+		return true;
+
+	return false;
     }
 
     String getJavaProg() {
@@ -921,5 +944,6 @@ public class RegressionScript extends Sc
 
     private RegressionEnvironment regEnv;
     private RegressionParameters params;
+    private String testDirPath;
 }
 


From mark at klomp.org  Sun Nov 23 09:17:54 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 23 Nov 2008 18:17:54 +0100
Subject: Allowing partial jtreg samejvm safe runs
Message-ID: <1227460674.29485.26.camel@hermans.wildebeest.org>

Hi,

Jonathan Gibbons has been extending jtreg so that tests can be run in
the same vm. He also made it so that most langtools tests are run that
way. That brings an enormous speed up. Since running all jdk tests takes
ages it would be great if we could use this same speedup there.

Problem is that -samevm only works if all tests have been adapted to
behave well (or marked as needing /othervm). So my idea was to add a
"whitelist mechanism" so you can indicate which (sub)dirs are ready to
be run with samevm.

Luckily jtreg has mostly been setup for this already. All Actions ask
their Script whether or not they should be running in an othervm. So we
hook into that to check the scripts location against a whitelist.

I choose the TEST.ROOT file as the location of the whitelist. Since that
is also the root of the test suite. I made the code so that the
whitelist is only used when running the full test suite from the root.
That way you can still experiment with -samevm or -othervm when running
subtrees of tests.

Also CCed jdk-regtest at sun.com since that address is mentioned in the
TEST.ROOT file with an request to contact them if you change anything in
that file.

Below is the implementation as I checked into icedtea6 (patch also
attached).

2008-11-23  Mark Wielaard  <mark at klomp.org>

    * test/jtreg/com/sun/javatest/regtest/Main.java
    (createParameters): Set same jvm safe dirs when non-null.
    (getSameJVMSafeDirs): New method that reads samejvmsafe property
    from TEST.ROOT.
    (sameJVMSafeDirs): New private field.
    * test/jtreg/com/sun/javatest/regtest/RegressionParameters.java
    (SAME_JVM_SAFE_DIRS): New static final field.
    (load): Read same jvm safe dirs.
    (save0): Write same jvm safe dirs.
    (getSameJVMSafeDirs): New method.
    (setSameJVMSafeDirs): New method.
    * test/jtreg/com/sun/javatest/regtest/RegressionScript.java
    (run): Set testDirPath.
    (isOtherJVM): Take same jvm safe into account.
    (isSameJVMSafe): New method.
    (testDirPath): New private field.

For icedtea6 I did a quick scan of the openjdk/jdk/test subdirs and
listed an initial set that work with -samejvm and added a patch to
augment the TEST.ROOT file (attached).

2008-11-23  Mark Wielaard  <mark at klomp.org>

    * patches/icedtea-samejvm-safe.patch: New patch.
    * Makefile.am (ICEDTEA_PATCHES): Add new patch.
    (check-jdk): Run jtreg with -samevm.
    * HACKING: Document new patch.

Comments on the idea and the implementation very appreciated.

With this 'make check-jdk' takes a little bit less than 3 hours on my
machine now. It was almost 3.5 hours, so it already saves a lot of time.
But we need to make much more tests work with samevm to bring the total
test running time down to something an ordinary developer would be
comfortable with running every day.

We have to see whether or not that is really possible. It seems jdi, rmi
and awt take up a lot of the time needed to run all tests, and I am not
sure those tests can be speed up much.

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jtreg-samejvm-safe.patch
Type: text/x-patch
Size: 6370 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081123/eecf8590/jtreg-samejvm-safe.patch 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: icedtea-samejvm-safe.patch
Type: text/x-patch
Size: 1489 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081123/eecf8590/icedtea-samejvm-safe.patch 

From mark at klomp.org  Sun Nov 23 09:37:19 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 23 Nov 2008 18:37:19 +0100
Subject: Allowing partial jtreg samejvm safe runs
In-Reply-To: <1227460674.29485.26.camel@hermans.wildebeest.org>
References: <1227460674.29485.26.camel@hermans.wildebeest.org>
Message-ID: <1227461839.29485.29.camel@hermans.wildebeest.org>

On Sun, 2008-11-23 at 18:17 +0100, Mark Wielaard wrote:
> Also CCed jdk-regtest at sun.com since that address is mentioned in the
> TEST.ROOT file with an request to contact them if you change anything in
> that file.

This address bounces. Should we change it to discuss at openjdk.java.net?

Cheers,

Mark



From Jonathan.Gibbons at Sun.COM  Sun Nov 23 09:57:13 2008
From: Jonathan.Gibbons at Sun.COM (Jonathan Gibbons)
Date: Sun, 23 Nov 2008 09:57:13 -0800
Subject: Allowing partial jtreg samejvm safe runs
In-Reply-To: <1227460674.29485.26.camel@hermans.wildebeest.org>
References: <1227460674.29485.26.camel@hermans.wildebeest.org>
Message-ID: <EB6434B6-6268-4806-97DC-0DC094BCF487@sun.com>

Mark,

I like this approach in that we don't mess up the tests with /othervm  
keywords
unnecessarily.  I think it is worth distinguishing tests which are  
inherently
"othervm" from those which are "currently othervm but potentially  
samevm with
a bit of effort".

-- Jon

On Nov 23, 2008, at 9:17 AM, Mark Wielaard wrote:

> Hi,
>
> Jonathan Gibbons has been extending jtreg so that tests can be run in
> the same vm. He also made it so that most langtools tests are run that
> way. That brings an enormous speed up. Since running all jdk tests  
> takes
> ages it would be great if we could use this same speedup there.
>
> Problem is that -samevm only works if all tests have been adapted to
> behave well (or marked as needing /othervm). So my idea was to add a
> "whitelist mechanism" so you can indicate which (sub)dirs are ready to
> be run with samevm.
>
> Luckily jtreg has mostly been setup for this already. All Actions ask
> their Script whether or not they should be running in an othervm. So  
> we
> hook into that to check the scripts location against a whitelist.
>
> I choose the TEST.ROOT file as the location of the whitelist. Since  
> that
> is also the root of the test suite. I made the code so that the
> whitelist is only used when running the full test suite from the root.
> That way you can still experiment with -samevm or -othervm when  
> running
> subtrees of tests.
>
> Also CCed jdk-regtest at sun.com since that address is mentioned in the
> TEST.ROOT file with an request to contact them if you change  
> anything in
> that file.
>
> Below is the implementation as I checked into icedtea6 (patch also
> attached).
>
> 2008-11-23  Mark Wielaard  <mark at klomp.org>
>
>    * test/jtreg/com/sun/javatest/regtest/Main.java
>    (createParameters): Set same jvm safe dirs when non-null.
>    (getSameJVMSafeDirs): New method that reads samejvmsafe property
>    from TEST.ROOT.
>    (sameJVMSafeDirs): New private field.
>    * test/jtreg/com/sun/javatest/regtest/RegressionParameters.java
>    (SAME_JVM_SAFE_DIRS): New static final field.
>    (load): Read same jvm safe dirs.
>    (save0): Write same jvm safe dirs.
>    (getSameJVMSafeDirs): New method.
>    (setSameJVMSafeDirs): New method.
>    * test/jtreg/com/sun/javatest/regtest/RegressionScript.java
>    (run): Set testDirPath.
>    (isOtherJVM): Take same jvm safe into account.
>    (isSameJVMSafe): New method.
>    (testDirPath): New private field.
>
> For icedtea6 I did a quick scan of the openjdk/jdk/test subdirs and
> listed an initial set that work with -samejvm and added a patch to
> augment the TEST.ROOT file (attached).
>
> 2008-11-23  Mark Wielaard  <mark at klomp.org>
>
>    * patches/icedtea-samejvm-safe.patch: New patch.
>    * Makefile.am (ICEDTEA_PATCHES): Add new patch.
>    (check-jdk): Run jtreg with -samevm.
>    * HACKING: Document new patch.
>
> Comments on the idea and the implementation very appreciated.
>
> With this 'make check-jdk' takes a little bit less than 3 hours on my
> machine now. It was almost 3.5 hours, so it already saves a lot of  
> time.
> But we need to make much more tests work with samevm to bring the  
> total
> test running time down to something an ordinary developer would be
> comfortable with running every day.
>
> We have to see whether or not that is really possible. It seems jdi,  
> rmi
> and awt take up a lot of the time needed to run all tests, and I am  
> not
> sure those tests can be speed up much.
>
> Cheers,
>
> Mark
> diff -r 9aae858397f9 test/jtreg/com/sun/javatest/regtest/Main.java
> --- a/test/jtreg/com/sun/javatest/regtest/Main.java	Fri Nov 21  
> 18:35:27 2008 -0500
> +++ b/test/jtreg/com/sun/javatest/regtest/Main.java	Sun Nov 23  
> 16:56:34 2008 +0100
> @@ -29,6 +29,7 @@
> import java.io.BufferedReader;
> import java.io.BufferedWriter;
> import java.io.File;
> +import java.io.FileInputStream;
> import java.io.FileNotFoundException;
> import java.io.FileReader;
> import java.io.FileWriter;
> @@ -52,6 +53,7 @@
> import java.util.Iterator;
> import java.util.List;
> import java.util.Map;
> +import java.util.Properties;
> import java.util.TreeMap;
>
> import com.sun.javatest.CompositeFilter;
> @@ -1354,6 +1356,10 @@
>             if (ignoreKind != null)
>                 rp.setIgnoreKind(ignoreKind);
>
> +            sameJVMSafeDirs = getSameJVMSafeDirs(ts);
> +            if (sameJVMSafeDirs != null)
> +                rp.setSameJVMSafeDirs(sameJVMSafeDirs);
> +
>             return rp;
>         } catch (TestSuite.Fault f) {
>             f.printStackTrace();
> @@ -1372,6 +1378,35 @@
>         } catch (IOException e) {
>             return file.getAbsoluteFile();
>         }
> +    }
> +
> +    // Returns directory (prefix) for tests that are same jvm safe
> +    // read from amejvmsafe property in TEST.ROOT file. Returning  
> null
> +    // means all tests are considered same jvm safe. null is returned
> +    // when there is no samejvmsafe property, or there was a problem
> +    // reading it, and when anything else than the test root was  
> given
> +    // as test file argument. Meaning that this only returns  
> something
> +    // non-null if anything was actually specified as same jvm safe  
> and
> +    // the whole test suite is being tested.
> +    private List<String> getSameJVMSafeDirs(File testRoot) {
> +	// Only use the same jvm safe dirs when running from the root.
> +	if (testFileArgs.size() != 1
> +	    || ! 
> canon(testFileArgs.iterator().next()).equals(canon(testRoot)))
> +	    return null;
> +
> +	try {
> +	    File file = new File(testRoot, "TEST.ROOT");
> +            if (file.exists()) {
> +		Properties testRootProps = new Properties();
> +		testRootProps.load(new FileInputStream(file));
> +		String safedirs = testRootProps.getProperty("samejvmsafe");
> +		if ((safedirs != null) && (safedirs.trim().length() > 0))
> +		    return Arrays.asList(StringArray.splitWS(safedirs));
> +	    }
> +	} catch (IOException ioe) {
> +	    // Bah, then just assume everything is safe.
> +	}
> +	return null;
>     }
>
>     private String getRelativePath(File base, File f) {
> @@ -1762,6 +1797,7 @@
>     // these args are jtreg extras
>     private File baseDirArg;
>     private boolean sameJVMFlag;
> +    private List<String> sameJVMSafeDirs;
>     private JDK jdk;
>     private boolean guiFlag;
>     private boolean reportOnlyFlag;
> diff -r 9aae858397f9 test/jtreg/com/sun/javatest/regtest/ 
> RegressionParameters.java
> --- a/test/jtreg/com/sun/javatest/regtest/RegressionParameters.java	 
> Fri Nov 21 18:35:27 2008 -0500
> +++ b/test/jtreg/com/sun/javatest/regtest/RegressionParameters.java	 
> Sun Nov 23 16:56:34 2008 +0100
> @@ -139,6 +139,7 @@
>     private static final String TEST_JAVA_OPTIONS = ".testJavaOpts";
>     private static final String IGNORE = ".ignore";
>     private static final String RETAIN_ARGS = ".retain";
> +    private static final String SAME_JVM_SAFE_DIRS =  
> ".samejvmsafedirs";
>
>     @Override
>     public void load(Map data, boolean checkChecksum) throws  
> Interview.Fault {
> @@ -182,6 +183,10 @@
>         v = (String) data.get(prefix + RETAIN_ARGS);
>         if (v != null)
>              
> setRetainArgs(Arrays.asList(StringArray.splitSeparator("\n", v)));
> +
> +        v = (String) data.get(prefix + SAME_JVM_SAFE_DIRS);
> +        if (v != null)
> +             
> setSameJVMSafeDirs(Arrays.asList(StringArray.splitSeparator("\n",  
> v)));
>     }
>
>     @SuppressWarnings("unchecked")
> @@ -203,6 +208,9 @@
>
>         if (jdk != null)
>             data.put(prefix + JDK, jdk.getPath());
> +
> +        if (sameJVMSafeDirs != null)
> +            data.put(prefix + SAME_JVM_SAFE_DIRS,  
> StringUtils.join(sameJVMSafeDirs, "\n"));
>
>         if (retainArgs != null)
>             data.put(prefix + RETAIN_ARGS,  
> StringUtils.join(retainArgs, "\n"));
> @@ -592,6 +600,18 @@
>     private Pattern retainFilesPattern;
>
>     //---------------------------------------------------------------------
> +
> +    List<String> getSameJVMSafeDirs() {
> +        return sameJVMSafeDirs;
> +    }
> +
> +    void setSameJVMSafeDirs(List<String> sameJVMSafeDirs) {
> +        this.sameJVMSafeDirs= sameJVMSafeDirs;
> +    }
> +
> +    private List<String> sameJVMSafeDirs;
> +
> + 
>     //---------------------------------------------------------------------
>
>     private static final String PATHSEP  =  
> System.getProperty("path.separator");
>     private static final String LINESEP  =  
> System.getProperty("line.separator");
> diff -r 9aae858397f9 test/jtreg/com/sun/javatest/regtest/ 
> RegressionScript.java
> --- a/test/jtreg/com/sun/javatest/regtest/RegressionScript.java	Fri  
> Nov 21 18:35:27 2008 -0500
> +++ b/test/jtreg/com/sun/javatest/regtest/RegressionScript.java	Sun  
> Nov 23 16:56:34 2008 +0100
> @@ -69,6 +69,10 @@
>     public Status run(String[] argv, TestDescription td,  
> TestEnvironment env) {
>         if (!(env instanceof RegressionEnvironment))
>             throw new AssertionError();
> +
> +	String testFilePath = td.getRootRelativePath();
> +	int lastSlash = testFilePath.lastIndexOf('/');
> +	testDirPath = testFilePath.substring(0, lastSlash);
>
>         regEnv = (RegressionEnvironment) env;
>         params = regEnv.params;
> @@ -833,7 +837,26 @@
>     }
>
>     boolean isOtherJVM() {
> -        return params.isOtherJVM();
> +	boolean samevm = !params.isOtherJVM();
> +	if (samevm)
> +	    return !isSameJVMSafe();
> +	else
> +	    return true;
> +    }
> +
> +    // Whether the actions of this script can safely run in the  
> same jvm.
> +    // No same jvm safe dirs given means they are all assumed safe.
> +    // If our actions come from a file in a subdir of a safe dir  
> that is ok.
> +    boolean isSameJVMSafe() {
> +        List<String> dirs = params.getSameJVMSafeDirs();
> +	if (dirs == null)
> +	    return true;
> +
> +	for (String dir : dirs)
> +	    if (testDirPath.startsWith(dir))
> +		return true;
> +
> +	return false;
>     }
>
>     String getJavaProg() {
> @@ -921,5 +944,6 @@
>
>     private RegressionEnvironment regEnv;
>     private RegressionParameters params;
> +    private String testDirPath;
> }
>
> <icedtea-samejvm-safe.patch>



From bugzilla-daemon at icedtea.classpath.org  Sun Nov 23 22:06:19 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 06:06:19 +0000
Subject: [Bug 263] New: starting java applet using icedtea plugin causes
	firefox to type backwards
Message-ID: <E1L4UaR-0008Bw-I0@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=263

           Summary: starting java applet using icedtea plugin causes firefox
                    to type backwards
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: major
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: eylemkoca at gmail.com


On Ubuntu 8.10, using IcedTea plugin version 6b12-0ubuntu6, enabling some sites
to start java applet crashes Firefox 3.0.4 causing any form field including the
browser url and search areas to type backwards. Buttons like "right-arrow" and
"end" do not work either. Closing the firefox normally leaves the java process
lingering, only remedy seems to be killing the java process under firefox...

Reproducible on Lotus Domino WebAccess sites, e.g.
https://bmgt5-notes.rhsmith.umd.edu, but did not try on others. Will add more
sites if/when confirmed...


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 01:35:10 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 09:35:10 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1L4XqY-0000AW-BP@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=261


gbenson at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |unassigned at icedtea.classpath
                   |                            |.org
            Summary|java.nio.channels.spi.Select|java.nio.channels.spi.Select
                   |orProvider.provider() fails |orProvider.provider() fails
                   |on Zero with -verify        |with -verify




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 02:32:03 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 10:32:03 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1L4Yjb-0000Dv-8t@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=261





------- Comment #4 from gbenson at redhat.com  2008-11-24 10:32 -------
This is something to do with the ecj build.  A number of classes are omitted
from the openjdk-ecj rt.jar, including:

@@ -15027,6 +15205,10 @@
 sun/nio/ch/DatagramSocketAdaptor$1.class
 sun/nio/ch/DatagramSocketAdaptor.class
 sun/nio/ch/DefaultSelectorProvider.class
+sun/nio/ch/DevPollArrayWrapper.class
+sun/nio/ch/DevPollArrayWrapper$Updator.class
+sun/nio/ch/DevPollSelectorImpl.class
+sun/nio/ch/DevPollSelectorProvider.class
 sun/nio/ch/DirectBuffer.class
 sun/nio/ch/EPollArrayWrapper.class
 sun/nio/ch/EPollArrayWrapper$Updator.class


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 02:41:23 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 10:41:23 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1L4Ysd-0000Em-5d@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=261





------- Comment #5 from mark at klomp.org  2008-11-24 10:41 -------
These are build/generated and instantiated a little strangely depending on
platform and detected kernel. See the ifeq ($(PLATFORM), blabla) bits in
jdk/make/java/nio/Makefile and the os/kernel detection code in
src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java

Most likely zero sets the arch or platform to something not recognized in the
above files.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 02:43:59 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 10:43:59 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1L4Yv9-0000FA-ID@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=261





------- Comment #6 from gbenson at redhat.com  2008-11-24 10:43 -------
The classes are listed in
openjdk/control/build/linux-amd64/tmp/jarfilelists/rt_jar_list
but not in 
openjdk-ecj/control/build/linux-amd64/tmp/jarfilelists/rt_jar_list.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 02:46:15 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 10:46:15 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1L4YxL-0000FJ-J8@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=261





------- Comment #7 from gbenson at redhat.com  2008-11-24 10:46 -------
(In reply to comment #5)
> These are build/generated and instantiated a little strangely depending on
> platform and detected kernel. See the ifeq ($(PLATFORM), blabla) bits in
> jdk/make/java/nio/Makefile and the os/kernel detection code in
> src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java
> 
> Most likely zero sets the arch or platform to something not recognized in the
> above files.

It doesn't seem to be this.  The problem is that the *Linux*-specific files are
installed but the *Solaris*-specific ones aren't.  In normal operation this
isn't a problem, but when you run with -verify the verifier can't see the
Solaris-specific class mentioned in
src/solaris/classes/sun/nio/ch/DefaultSelectorProvider.java so it fails that
class.


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.


From jpa at mgb-tech.com  Mon Nov 24 04:11:31 2008
From: jpa at mgb-tech.com (Jan Pannecoeck)
Date: Mon, 24 Nov 2008 13:11:31 +0100
Subject: IcedTea on ARM
Message-ID: <492A99F3.1020201@mgb-tech.com>

Hello,

I'm currently working with an ARM9261 with OpenEmbedded running on
it, linux kernel version 2.6.22. I'm currently using JamVM as
virtual machine but I'm thinking about using IcedTea maybe, because
performancy issues. Now my question is, if the currently version of
IcedTea could work properly on an ARM with OpenEmbedded linux and
also can be build for the ARM of course. And since the main problems are performancy issues, I'm wondering if IcedTea is faster than JamVM?
 
The IcedTea website tells me that IcedTea is only been build on x86,
x86_64, pcc and ppc64 architectures, but I hope that someone can give me
some more information about IcedTea running on an ARM.
 
Thanks in advance,
Jan Pannecoeck



From gnu_andrew at member.fsf.org  Mon Nov 24 04:16:34 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 24 Nov 2008 12:16:34 +0000
Subject: IcedTea on ARM
In-Reply-To: <492A99F3.1020201@mgb-tech.com>
References: <492A99F3.1020201@mgb-tech.com>
Message-ID: <17c6771e0811240416i1f58452ak75f8d05af8c2c10a@mail.gmail.com>

On 24/11/2008, Jan Pannecoeck <jpa at mgb-tech.com> wrote:
> Hello,
>
>  I'm currently working with an ARM9261 with OpenEmbedded running on
>  it, linux kernel version 2.6.22. I'm currently using JamVM as
>  virtual machine but I'm thinking about using IcedTea maybe, because
>  performancy issues. Now my question is, if the currently version of
>  IcedTea could work properly on an ARM with OpenEmbedded linux and
>  also can be build for the ARM of course. And since the main problems are
> performancy issues, I'm wondering if IcedTea is faster than JamVM?
>
>  The IcedTea website tells me that IcedTea is only been build on x86,
>  x86_64, pcc and ppc64 architectures, but I hope that someone can give me
>  some more information about IcedTea running on an ARM.
>
>  Thanks in advance,
>  Jan Pannecoeck
>
>

IcedTea on ARM relies on using either Gary Benson's work on Zero/Shark
to provide a port of HotSpot to the architecture or on using CACAO as
the VM instead with the OpenJDK class library.

I'm not sure how performance will compare with JamVM.  API
completeness of the class library will be better using the OpenJDK
class library over GNU Classpath, but Zero will definitely be much
slower.  I don't know if Gary has tried Shark on ARM yet and what the
results are.  CACAO and OpenJDK may be your best choice for now, which
means building IcedTea with ./configure --with-cacao.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From mark at klomp.org  Mon Nov 24 04:20:34 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 24 Nov 2008 13:20:34 +0100
Subject: IcedTea on ARM
In-Reply-To: <492A99F3.1020201@mgb-tech.com>
References: <492A99F3.1020201@mgb-tech.com>
Message-ID: <1227529235.3362.3.camel@dijkstra.wildebeest.org>

Hi Jan,

On Mon, 2008-11-24 at 13:11 +0100, Jan Pannecoeck wrote:
> The IcedTea website tells me that IcedTea is only been build on x86,
> x86_64, pcc and ppc64 architectures, but I hope that someone can give me
> some more information about IcedTea running on an ARM.

It should be possible, either with zero, which is most likely pretty
super slow, and with cacao, which is hopefully a bit speedier:
http://gbenson.net/?p=88
http://www.advogato.org/person/twisti/diary.html?start=11
http://labb.zafena.se/?p=30

I haven't tried either way myself though.

Cheers,

Mark



From twisti at complang.tuwien.ac.at  Mon Nov 24 04:18:28 2008
From: twisti at complang.tuwien.ac.at (Christian Thalinger)
Date: Mon, 24 Nov 2008 13:18:28 +0100
Subject: IcedTea on ARM
In-Reply-To: <492A99F3.1020201@mgb-tech.com>
References: <492A99F3.1020201@mgb-tech.com>
Message-ID: <1227529108.2159.11.camel@localhost.localdomain>

On Mon, 2008-11-24 at 13:11 +0100, Jan Pannecoeck wrote:
> Hello,
> 
> I'm currently working with an ARM9261 with OpenEmbedded running on
> it, linux kernel version 2.6.22. I'm currently using JamVM as
> virtual machine but I'm thinking about using IcedTea maybe, because
> performancy issues. Now my question is, if the currently version of
> IcedTea could work properly on an ARM with OpenEmbedded linux and
> also can be build for the ARM of course. And since the main problems
> are performancy issues, I'm wondering if IcedTea is faster than JamVM?
>  
> The IcedTea website tells me that IcedTea is only been build on x86,
> x86_64, pcc and ppc64 architectures, but I hope that someone can give
> me
> some more information about IcedTea running on an ARM.

Since it's for performance reasons, I doubt you will be happy with
HotSpot Zero in IcedTea.  And as Shark isn't there yet, your only
possibility is to try CACAO as VM in IcedTea[1].  Since then I have
added some configure switches to IcedTea which download and build CACAO
for you.  But you have to build it natively...

[1] http://www.advogato.org/person/twisti/diary/11.html

- Christian



From jpa at mgb-tech.com  Mon Nov 24 04:23:28 2008
From: jpa at mgb-tech.com (Jan Pannecoeck)
Date: Mon, 24 Nov 2008 13:23:28 +0100
Subject: IcedTea on ARM
In-Reply-To: <17c6771e0811240416i1f58452ak75f8d05af8c2c10a@mail.gmail.com>
References: <492A99F3.1020201@mgb-tech.com>
	<17c6771e0811240416i1f58452ak75f8d05af8c2c10a@mail.gmail.com>
Message-ID: <492A9CC0.3070101@mgb-tech.com>

I've contacted mr. Benson before, he pointed me to this mailinglist, but 
he couldn't help me with this problem since he had no experience on ARM...

But I'll try cacao with openJDK and see if I can get that working properly!

Thanks!
Jan

Andrew John Hughes wrote:
> On 24/11/2008, Jan Pannecoeck <jpa at mgb-tech.com> wrote:
>   
>> Hello,
>>
>>  I'm currently working with an ARM9261 with OpenEmbedded running on
>>  it, linux kernel version 2.6.22. I'm currently using JamVM as
>>  virtual machine but I'm thinking about using IcedTea maybe, because
>>  performancy issues. Now my question is, if the currently version of
>>  IcedTea could work properly on an ARM with OpenEmbedded linux and
>>  also can be build for the ARM of course. And since the main problems are
>> performancy issues, I'm wondering if IcedTea is faster than JamVM?
>>
>>  The IcedTea website tells me that IcedTea is only been build on x86,
>>  x86_64, pcc and ppc64 architectures, but I hope that someone can give me
>>  some more information about IcedTea running on an ARM.
>>
>>  Thanks in advance,
>>  Jan Pannecoeck
>>
>>
>>     
>
> IcedTea on ARM relies on using either Gary Benson's work on Zero/Shark
> to provide a port of HotSpot to the architecture or on using CACAO as
> the VM instead with the OpenJDK class library.
>
> I'm not sure how performance will compare with JamVM.  API
> completeness of the class library will be better using the OpenJDK
> class library over GNU Classpath, but Zero will definitely be much
> slower.  I don't know if Gary has tried Shark on ARM yet and what the
> results are.  CACAO and OpenJDK may be your best choice for now, which
> means building IcedTea with ./configure --with-cacao.
>   


From aph at redhat.com  Mon Nov 24 04:25:53 2008
From: aph at redhat.com (Andrew Haley)
Date: Mon, 24 Nov 2008 12:25:53 +0000
Subject: IcedTea on ARM
In-Reply-To: <17c6771e0811240416i1f58452ak75f8d05af8c2c10a@mail.gmail.com>
References: <492A99F3.1020201@mgb-tech.com>
	<17c6771e0811240416i1f58452ak75f8d05af8c2c10a@mail.gmail.com>
Message-ID: <492A9D51.6040007@redhat.com>

Andrew John Hughes wrote:
> On 24/11/2008, Jan Pannecoeck <jpa at mgb-tech.com> wrote:

>>  I'm currently working with an ARM9261 with OpenEmbedded running on
>>  it, linux kernel version 2.6.22. I'm currently using JamVM as
>>  virtual machine but I'm thinking about using IcedTea maybe, because
>>  performancy issues. Now my question is, if the currently version of
>>  IcedTea could work properly on an ARM with OpenEmbedded linux and
>>  also can be build for the ARM of course. And since the main problems are
>>  performancy issues, I'm wondering if IcedTea is faster than JamVM?
>>
>>  The IcedTea website tells me that IcedTea is only been build on x86,
>>  x86_64, pcc and ppc64 architectures, but I hope that someone can give me
>>  some more information about IcedTea running on an ARM.
> 
> IcedTea on ARM relies on using either Gary Benson's work on Zero/Shark
> to provide a port of HotSpot to the architecture or on using CACAO as
> the VM instead with the OpenJDK class library.
> 
> I'm not sure how performance will compare with JamVM.  API
> completeness of the class library will be better using the OpenJDK
> class library over GNU Classpath, but Zero will definitely be much
> slower.  I don't know if Gary has tried Shark on ARM yet and what the
> results are.  CACAO and OpenJDK may be your best choice for now, which
> means building IcedTea with ./configure --with-cacao.

Yes.  Right now the high performance options on ARM are Cacao and gcj.
The other possible problems are the footprint size of the whole system:
I expect IcedTea is going to be a lot bigger than Cacao + GNU Classpath.

Andrew.


From mark at klomp.org  Mon Nov 24 04:30:13 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 24 Nov 2008 12:30:13 +0000
Subject: changeset in /hg/icedtea6: Add missing Gervill test files.
Message-ID: <hg.1c9ba5e52e34.1227529813.2873452341184383832@icedtea.classpath.org>

changeset 1c9ba5e52e34 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1c9ba5e52e34
description:
	Add missing Gervill test files.

	2008-11-24  Mark Wielaard  <mark at klomp.org>

	        * overlays/openjdk/jdk/test/com/sun/media/sound/
	        EmergencySoundbank/TestCreateSoundbank.java
	        ModelByteBuffer/RandomFileInputStream/Available.java
	        ModelByteBuffer/RandomFileInputStream/Close.java
	        ModelByteBuffer/RandomFileInputStream/MarkReset.java
	        ModelByteBuffer/RandomFileInputStream/MarkSupported.java
	        ModelByteBuffer/RandomFileInputStream/Read.java
	        ModelByteBuffer/RandomFileInputStream/ReadByte.java
	        ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
	        ModelByteBuffer/RandomFileInputStream/Skip.java
	        SoftAudioSynthesizer/DummySourceDataLine.java
	        SoftFilter/TestProcessAudio.java
	        SoftSynthesizer/DummySourceDataLine.java: Add missing Gervill
	        test files.

diffstat:

13 files changed, 1519 insertions(+)
ChangeLog                                                                                               |   17 
overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java               |   59 ++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java      |  107 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java          |  104 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java      |  129 ++++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java  |  106 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Read.java           |  117 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByte.java       |  118 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java |  118 +++++
overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Skip.java           |  131 ++++++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftAudioSynthesizer/DummySourceDataLine.java             |  207 ++++++++++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftFilter/TestProcessAudio.java                          |   99 ++++
overlays/openjdk/jdk/test/com/sun/media/sound/SoftSynthesizer/DummySourceDataLine.java                  |  207 ++++++++++

diffs (truncated from 1574 to 500 lines):

diff -r b7ce0d293432 -r 1c9ba5e52e34 ChangeLog
--- a/ChangeLog	Sun Nov 23 17:46:11 2008 +0100
+++ b/ChangeLog	Mon Nov 24 13:30:00 2008 +0100
@@ -1,3 +1,20 @@ 2008-11-23  Mark Wielaard  <mark at klomp.o
+2008-11-24  Mark Wielaard  <mark at klomp.org>
+
+	* overlays/openjdk/jdk/test/com/sun/media/sound/
+	EmergencySoundbank/TestCreateSoundbank.java
+	ModelByteBuffer/RandomFileInputStream/Available.java
+	ModelByteBuffer/RandomFileInputStream/Close.java
+	ModelByteBuffer/RandomFileInputStream/MarkReset.java
+	ModelByteBuffer/RandomFileInputStream/MarkSupported.java
+	ModelByteBuffer/RandomFileInputStream/Read.java
+	ModelByteBuffer/RandomFileInputStream/ReadByte.java
+	ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
+	ModelByteBuffer/RandomFileInputStream/Skip.java
+	SoftAudioSynthesizer/DummySourceDataLine.java
+	SoftFilter/TestProcessAudio.java
+	SoftSynthesizer/DummySourceDataLine.java: Add missing Gervill
+	test files.
+
 2008-11-23  Mark Wielaard  <mark at klomp.org>
 
 	* patches/icedtea-samejvm-safe.patch: New patch.
diff -r b7ce0d293432 -r 1c9ba5e52e34 overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/test/com/sun/media/sound/EmergencySoundbank/TestCreateSoundbank.java	Mon Nov 24 13:30:00 2008 +0100
@@ -0,0 +1,59 @@
+import java.io.File;
+
+import javax.sound.midi.Instrument;
+import javax.sound.midi.Patch;
+import javax.sound.midi.Soundbank;
+
+import com.sun.media.sound.EmergencySoundbank;
+import com.sun.media.sound.ModelInstrument;
+import com.sun.media.sound.ModelPatch;
+
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+ @summary Test EmergencySoundbank createSoundbank() method */
+
+public class TestCreateSoundbank {
+
+    public static void main(String[] args) throws Exception {
+        
+        Soundbank soundbank = EmergencySoundbank.createSoundbank();
+        for (int i = 0; i < 128; i++) {
+            Patch patch = new ModelPatch(0, i, false);
+            ModelInstrument ins = (ModelInstrument)soundbank.getInstrument(patch);
+            if(ins == null)
+                throw new Exception("Instrument " + i + " is missing!");
+            if(ins.getPerformers().length == 0)
+                throw new Exception("Instrument " + i + " doesn't have any performers!");
+        }
+        Patch patch = new ModelPatch(0, 0, true);
+        ModelInstrument ins = (ModelInstrument)soundbank.getInstrument(patch);
+        if(ins == null)
+            throw new Exception("Drumkit instrument is missing!");
+        if(ins.getPerformers().length == 0)
+            throw new Exception("Drumkit instrument doesn't have any performers!");
+    }   
+}
diff -r b7ce0d293432 -r 1c9ba5e52e34 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Available.java	Mon Nov 24 13:30:00 2008 +0100
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @summary Test ModelByteBuffer.RandomFileInputStream available() method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class Available {
+
+    static float[] testarray;
+    static byte[] test_byte_array;  
+    static File test_file;
+    static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+    
+    static void setUp() throws Exception {
+        testarray = new float[1024];
+        for (int i = 0; i < 1024; i++) {
+            double ii = i / 1024.0;
+            ii = ii * ii;
+            testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+            testarray[i] *= 0.3;
+        }       
+        test_byte_array = new byte[testarray.length*2];
+        AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+        test_file = File.createTempFile("test", ".raw");
+        FileOutputStream fos = new FileOutputStream(test_file);
+        fos.write(test_byte_array);
+    }   
+    
+    static void tearDown() throws Exception {
+        if(!test_file.delete())
+            test_file.deleteOnExit();
+    }           
+    
+    public static void main(String[] args) throws Exception {
+        try
+        {
+            setUp();
+            
+            for (int i = 0; i < 8; i++) {
+                ModelByteBuffer buff;
+                if(i % 2 == 0)
+                    buff = new ModelByteBuffer(test_file);
+                else
+                    buff = new ModelByteBuffer(test_byte_array);
+                if((i / 2) == 1)
+                    buff.subbuffer(5);
+                if((i / 2) == 2)
+                    buff.subbuffer(5,500);
+                if((i / 2) == 3)
+                    buff.subbuffer(5,600,true);
+                
+                long capacity = buff.capacity();
+                InputStream is = buff.getInputStream();
+                try
+                {                                     
+                    int ret = is.available();
+                    if(ret != capacity)
+                        throw new RuntimeException("is.available() return unexpected value!");
+                }
+                finally
+                {
+                    is.close();
+                }
+                if(buff.capacity() != capacity)
+                    throw new RuntimeException("Capacity variable should not change!");                
+            }           
+        }
+        finally
+        {
+            tearDown();
+        }       
+    }
+
+}
diff -r b7ce0d293432 -r 1c9ba5e52e34 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/Close.java	Mon Nov 24 13:30:00 2008 +0100
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @summary Test ModelByteBuffer.RandomFileInputStream close method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class Close {
+
+    static float[] testarray;
+    static byte[] test_byte_array;  
+    static File test_file;
+    static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+    
+    static void setUp() throws Exception {
+        testarray = new float[1024];
+        for (int i = 0; i < 1024; i++) {
+            double ii = i / 1024.0;
+            ii = ii * ii;
+            testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+            testarray[i] *= 0.3;
+        }       
+        test_byte_array = new byte[testarray.length*2];
+        AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+        test_file = File.createTempFile("test", ".raw");
+        FileOutputStream fos = new FileOutputStream(test_file);
+        fos.write(test_byte_array);
+    }   
+    
+    static void tearDown() throws Exception {
+        if(!test_file.delete())
+            test_file.deleteOnExit();
+    }           
+    
+    public static void main(String[] args) throws Exception {
+        try
+        {
+            setUp();
+            
+            for (int i = 0; i < 8; i++) {
+                ModelByteBuffer buff;
+                if(i % 2 == 0)
+                    buff = new ModelByteBuffer(test_file);
+                else
+                    buff = new ModelByteBuffer(test_byte_array);
+                if((i / 2) == 1)
+                    buff.subbuffer(5);
+                if((i / 2) == 2)
+                    buff.subbuffer(5,500);
+                if((i / 2) == 3)
+                    buff.subbuffer(5,600,true);
+                
+                long capacity = buff.capacity();
+                InputStream is = buff.getInputStream();
+                try
+                {                    
+                }
+                finally
+                {
+                    is.close();
+                }
+                if(buff.capacity() != capacity)
+                    throw new RuntimeException("Capacity variable should not change!");
+            }           
+        }
+        finally
+        {
+            tearDown();
+        }       
+    }
+
+}
diff -r b7ce0d293432 -r 1c9ba5e52e34 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkReset.java	Mon Nov 24 13:30:00 2008 +0100
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @summary Test ModelByteBuffer.RandomFileInputStream mark and reset methods */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class MarkReset {
+
+    static float[] testarray;
+    static byte[] test_byte_array;  
+    static File test_file;
+    static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+    
+    static void setUp() throws Exception {
+        testarray = new float[1024];
+        for (int i = 0; i < 1024; i++) {
+            double ii = i / 1024.0;
+            ii = ii * ii;
+            testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+            testarray[i] *= 0.3;
+        }       
+        test_byte_array = new byte[testarray.length*2];
+        AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+        test_file = File.createTempFile("test", ".raw");
+        FileOutputStream fos = new FileOutputStream(test_file);
+        fos.write(test_byte_array);
+    }   
+    
+    static void tearDown() throws Exception {
+        if(!test_file.delete())
+            test_file.deleteOnExit();
+    }           
+    
+    public static void main(String[] args) throws Exception {
+        try
+        {
+            setUp();
+            
+            for (int i = 0; i < 8; i++) {
+                ModelByteBuffer buff;
+                if(i % 2 == 0)
+                    buff = new ModelByteBuffer(test_file);
+                else
+                    buff = new ModelByteBuffer(test_byte_array);
+                if((i / 2) == 1)
+                    buff.subbuffer(5);
+                if((i / 2) == 2)
+                    buff.subbuffer(5,500);
+                if((i / 2) == 3)
+                    buff.subbuffer(5,600,true);
+                
+                long capacity = buff.capacity();
+                InputStream is = buff.getInputStream();
+                try
+                {                
+                    is.mark(1000);
+                    int ret = is.available();
+                    int a = is.read();
+                    is.skip(75);                          
+                    is.reset();
+                    if(is.available() != ret)
+                        throw new RuntimeException(
+                                "is.available() returns incorrect value ("
+                                + is.available() + "!="+(ret)+") !");
+                    int b = is.read();
+                    if(a != b)
+                        throw new RuntimeException(
+                                "is doesn't return same value after reset ("
+                                + a + "!="+b+") !");
+                    
+                    is.skip(15);        
+                    ret = is.available();
+                    is.mark(1000);
+                    is.reset();
+                    if(is.available() != ret)
+                        throw new RuntimeException(
+                                "is.available() returns incorrect value ("
+                                + is.available() + "!="+(ret)+") !");
+                   
+                    
+                }
+                finally
+                {
+                    is.close();
+                }
+                if(buff.capacity() != capacity)
+                    throw new RuntimeException("Capacity variable should not change!");                
+            }           
+        }
+        finally
+        {
+            tearDown();
+        }       
+    }
+
+}
diff -r b7ce0d293432 -r 1c9ba5e52e34 overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/overlays/openjdk/jdk/test/com/sun/media/sound/ModelByteBuffer/RandomFileInputStream/MarkSupported.java	Mon Nov 24 13:30:00 2008 +0100
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/* @test
+   @summary Test ModelByteBuffer.RandomFileInputStream markSupported() method */
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.sound.sampled.*;
+
+import com.sun.media.sound.*;
+
+public class MarkSupported {
+
+    static float[] testarray;
+    static byte[] test_byte_array;  
+    static File test_file;
+    static AudioFormat format = new AudioFormat(44100, 16, 1, true, false);
+    
+    static void setUp() throws Exception {
+        testarray = new float[1024];
+        for (int i = 0; i < 1024; i++) {
+            double ii = i / 1024.0;
+            ii = ii * ii;
+            testarray[i] = (float)Math.sin(10*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(1.731 + 2*ii*2*Math.PI);
+            testarray[i] += (float)Math.sin(0.231 + 6.3*ii*2*Math.PI);
+            testarray[i] *= 0.3;
+        }       
+        test_byte_array = new byte[testarray.length*2];
+        AudioFloatConverter.getConverter(format).toByteArray(testarray, test_byte_array);
+        test_file = File.createTempFile("test", ".raw");


From mark at klomp.org  Mon Nov 24 04:31:55 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 24 Nov 2008 13:31:55 +0100
Subject: Add missing Gervill test files
Message-ID: <1227529915.3362.6.camel@dijkstra.wildebeest.org>

Hi,

In my last Gervill import I accidentally [1] missed some newly added
test files. This patch adds them.

2008-11-24  Mark Wielaard  <mark at klomp.org>

        * overlays/openjdk/jdk/test/com/sun/media/sound/
        EmergencySoundbank/TestCreateSoundbank.java
        ModelByteBuffer/RandomFileInputStream/Available.java
        ModelByteBuffer/RandomFileInputStream/Close.java
        ModelByteBuffer/RandomFileInputStream/MarkReset.java
        ModelByteBuffer/RandomFileInputStream/MarkSupported.java
        ModelByteBuffer/RandomFileInputStream/Read.java
        ModelByteBuffer/RandomFileInputStream/ReadByte.java
        ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
        ModelByteBuffer/RandomFileInputStream/Skip.java
        SoftAudioSynthesizer/DummySourceDataLine.java
        SoftFilter/TestProcessAudio.java
        SoftSynthesizer/DummySourceDataLine.java: Add missing Gervill
        test files.

Cheers,

Mark

[1] Still trying to figure out why hg status didn't show them, since
they were in my local tree.



From gnu_andrew at member.fsf.org  Mon Nov 24 04:36:02 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 24 Nov 2008 12:36:02 +0000
Subject: IcedTea on ARM
In-Reply-To: <492A9D51.6040007@redhat.com>
References: <492A99F3.1020201@mgb-tech.com>
	<17c6771e0811240416i1f58452ak75f8d05af8c2c10a@mail.gmail.com>
	<492A9D51.6040007@redhat.com>
Message-ID: <17c6771e0811240436n363678d7y85c2bd6b0f1e1675@mail.gmail.com>

On 24/11/2008, Andrew Haley <aph at redhat.com> wrote:
> Andrew John Hughes wrote:
>  > On 24/11/2008, Jan Pannecoeck <jpa at mgb-tech.com> wrote:
>
>
> >>  I'm currently working with an ARM9261 with OpenEmbedded running on
>  >>  it, linux kernel version 2.6.22. I'm currently using JamVM as
>  >>  virtual machine but I'm thinking about using IcedTea maybe, because
>  >>  performancy issues. Now my question is, if the currently version of
>  >>  IcedTea could work properly on an ARM with OpenEmbedded linux and
>  >>  also can be build for the ARM of course. And since the main problems are
>  >>  performancy issues, I'm wondering if IcedTea is faster than JamVM?
>  >>
>  >>  The IcedTea website tells me that IcedTea is only been build on x86,
>  >>  x86_64, pcc and ppc64 architectures, but I hope that someone can give me
>  >>  some more information about IcedTea running on an ARM.
>  >
>
> > IcedTea on ARM relies on using either Gary Benson's work on Zero/Shark
>  > to provide a port of HotSpot to the architecture or on using CACAO as
>  > the VM instead with the OpenJDK class library.
>  >
>  > I'm not sure how performance will compare with JamVM.  API
>  > completeness of the class library will be better using the OpenJDK
>  > class library over GNU Classpath, but Zero will definitely be much
>  > slower.  I don't know if Gary has tried Shark on ARM yet and what the
>  > results are.  CACAO and OpenJDK may be your best choice for now, which
>  > means building IcedTea with ./configure --with-cacao.
>
>
> Yes.  Right now the high performance options on ARM are Cacao and gcj.
>  The other possible problems are the footprint size of the whole system:
>  I expect IcedTea is going to be a lot bigger than Cacao + GNU Classpath.
>
>
>  Andrew.
>

Aaah, I didn't take size into consideration... JamVM + GNU Classpath
is going to have the smallest footprint, followed by CACAO + GNU
Classpath.  The OpenJDK class library is significantly bigger with
probably a lot of cruft you won't use.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From gnu_andrew at member.fsf.org  Mon Nov 24 04:37:19 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 24 Nov 2008 12:37:19 +0000
Subject: Add missing Gervill test files
In-Reply-To: <1227529915.3362.6.camel@dijkstra.wildebeest.org>
References: <1227529915.3362.6.camel@dijkstra.wildebeest.org>
Message-ID: <17c6771e0811240437r4159bbdel3fe5437314c9c4c6@mail.gmail.com>

On 24/11/2008, Mark Wielaard <mark at klomp.org> wrote:
> Hi,
>
>  In my last Gervill import I accidentally [1] missed some newly added
>  test files. This patch adds them.
>
>  2008-11-24  Mark Wielaard  <mark at klomp.org>
>
>         * overlays/openjdk/jdk/test/com/sun/media/sound/
>         EmergencySoundbank/TestCreateSoundbank.java
>         ModelByteBuffer/RandomFileInputStream/Available.java
>         ModelByteBuffer/RandomFileInputStream/Close.java
>         ModelByteBuffer/RandomFileInputStream/MarkReset.java
>         ModelByteBuffer/RandomFileInputStream/MarkSupported.java
>         ModelByteBuffer/RandomFileInputStream/Read.java
>         ModelByteBuffer/RandomFileInputStream/ReadByte.java
>         ModelByteBuffer/RandomFileInputStream/ReadByteIntInt.java
>         ModelByteBuffer/RandomFileInputStream/Skip.java
>         SoftAudioSynthesizer/DummySourceDataLine.java
>         SoftFilter/TestProcessAudio.java
>         SoftSynthesizer/DummySourceDataLine.java: Add missing Gervill
>         test files.
>
>  Cheers,
>
>  Mark
>
>  [1] Still trying to figure out why hg status didn't show them, since
>  they were in my local tree.
>
>

Had the same issue with IcedTea7 and the property files describing the
services; hence the separate commit for them when I spotted the
mistake.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 07:04:35 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 15:04:35 +0000
Subject: [Bug 105] Crash-Report ZendStudio for Eclipse
Message-ID: <E1L4czL-0000Um-Sv@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=105





------- Comment #2 from spam2 at rhsoft.net  2008-11-24 15:04 -------
Sorry for the late answer
Yes, with openjdk all works like a charme including java-applets in firefox
(fedora 9), nice to see that now nearly all software comes with the
package-manager


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 07:24:28 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 15:24:28 +0000
Subject: [Bug 105] Crash-Report ZendStudio for Eclipse
Message-ID: <E1L4dIa-0000W3-Vs@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=105


mark at klomp.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #3 from mark at klomp.org  2008-11-24 15:24 -------
Thanks for testing and confirming things work "like a charm" now. Great!


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Mon Nov 24 07:25:13 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 24 Nov 2008 15:25:13 +0000
Subject: [Bug 263] starting java applet using icedtea plugin causes firefox to
	type backwards
Message-ID: <E1L4dJJ-0000WF-Dl@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=263


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From aph at redhat.com  Mon Nov 24 10:17:56 2008
From: aph at redhat.com (Andrew Haley)
Date: Mon, 24 Nov 2008 18:17:56 +0000
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <492ADA41.2060804@Sun.COM>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>
	<492ADA41.2060804@Sun.COM>
Message-ID: <492AEFD4.6090706@redhat.com>

Xiomara.Jayasena at Sun.COM wrote:
> On 11/24/08 08:00, Andrew Haley wrote:
>> Xiomara Jayasena wrote:
>>  
>>> Hi,
>>>
>>> The official Release Engineering builds for JDK 7 will be moving from
>>> the following OSs:
>>>
>>> *32 bit builds*
>>> ==========
>>> *From: *RH AS 2.1 to Fedora 9
>>>
>>> *64 bit builds*
>>> ==========
>>> *From: *SUSE 8 to: Fedora 9
>>>
>>> All required Makefile changes are in place, there are still  other items
>>> that are still being investigated for this OS upgrade to happen but
>>> wanted to inform of the changes that are on the way.
>>> *When:*  It is expected that this change will happen by build 42.
>>>
>>> Please let me know if there are any questions.
>>>     
>>
>> We've had to fix a few compatibility bugs in IcedTea.  Do you want us to
>> send you the patches?
>>   
> 
> Yes, please -- send me the patches.

OK.

* icedtea-f2i-overflow.patch fixes some overflows that are undefined
behaviour in C++.

* icedtea-hotspot-citypeflow.patch fixes an incorrect use of an enum.

* icedtea-lib64.patch fixes directory search paths.

* icedtea-gcc-4.3.patch fixes some compilation errors.

* icedtea-no-bcopy.patch removes the definition of the BSD bcopy and bcmp
functions.

The first two are really important because without them g++ generates
bad code.

Andrew.



From mark at klomp.org  Mon Nov 24 12:52:36 2008
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 24 Nov 2008 20:52:36 +0000
Subject: changeset in /hg/icedtea6: * Makefile.am (jtregcheck): Clean up ...
Message-ID: <hg.0d528f5c93eb.1227559956.2873452341184383832@icedtea.classpath.org>

changeset 0d528f5c93eb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0d528f5c93eb
description:
	* Makefile.am (jtregcheck): Clean up jtreg-summary.log a bit more.

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog   |    4 ++++
Makefile.am |    2 +-

diffs (23 lines):

diff -r 1c9ba5e52e34 -r 0d528f5c93eb ChangeLog
--- a/ChangeLog	Mon Nov 24 13:30:00 2008 +0100
+++ b/ChangeLog	Mon Nov 24 21:52:30 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-24  Mark Wielaard  <mark at klomp.o
+2008-11-24  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (jtregcheck): Clean up jtreg-summary.log a bit more.
+
 2008-11-24  Mark Wielaard  <mark at klomp.org>
 
 	* overlays/openjdk/jdk/test/com/sun/media/sound/
diff -r 1c9ba5e52e34 -r 0d528f5c93eb Makefile.am
--- a/Makefile.am	Mon Nov 24 13:30:00 2008 +0100
+++ b/Makefile.am	Mon Nov 24 21:52:30 2008 +0100
@@ -1618,7 +1618,7 @@ jtregcheck: jtreg check-hotspot check-la
 jtregcheck: jtreg check-hotspot check-langtools check-jdk
 	for i in hotspot langtools jdk; do \
 	  echo "--------------- jtreg console summary for $$i ---------------"; \
-	  egrep -v '^(Passed:|Directory)' test/check-$$i.log; \
+	  egrep -v '^(Passed:|Directory)|Re[a-z]+\ written\ to)' test/check-$$i.log; \
 	done | tee test/jtreg-summary.log
 
 	: # kill testsuite processes still hanging


From theBohemian at gmx.net  Mon Nov 24 18:21:03 2008
From: theBohemian at gmx.net (Robert Schuster)
Date: Tue, 25 Nov 2008 03:21:03 +0100
Subject: IcedTea on ARM
In-Reply-To: <492A99F3.1020201@mgb-tech.com>
References: <492A99F3.1020201@mgb-tech.com>
Message-ID: <492B610F.1010908@gmx.net>

Hi Jan,
I am maintaining the Java support in OE.

Jan Pannecoeck schrieb:
> Hello,
> 
> I'm currently working with an ARM9261 with OpenEmbedded running on
> it, linux kernel version 2.6.22. I'm currently using JamVM as
> virtual machine but I'm thinking about using IcedTea maybe, because
> performancy issues. Now my question is, if the currently version of
> IcedTea could work properly on an ARM with OpenEmbedded linux and
> also can be build for the ARM of course. And since the main problems are
> performancy issues, I'm wondering if IcedTea is faster than JamVM?
If performance is an issue you can easily build and try cacao /w
classpath as a first step.

Just 'bitbake cacao' and put the package on your device.

> The IcedTea website tells me that IcedTea is only been build on x86,
> x86_64, pcc and ppc64 architectures, but I hope that someone can give me
> some more information about IcedTea running on an ARM.
I doubt that Icedtea/Hotspot in its present for ARM will be faster than
Jamvm or Cacao. Jamvm is a pretty decent interpreter that does all kinds
of tricks and uses handcoded assembly for JNI interaction (at least on
ARM, x86 and PPC). Cacao on the other hand is the only VM available for
ARM that has a JIT compiler (at least if your target platform is J2SE).

Btw: Work is underway to get Cacao+OpenJDK and Hotspot+OpenJDK via
Icedtea into OpenEmbedded. :)

Regards
Robert

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081125/2f0c358b/signature.asc 

From gnu_andrew at member.fsf.org  Mon Nov 24 21:19:45 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 25 Nov 2008 05:19:45 +0000
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <492AEFD4.6090706@redhat.com>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>
	<492ADA41.2060804@Sun.COM> <492AEFD4.6090706@redhat.com>
Message-ID: <17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>

On 24/11/2008, Andrew Haley <aph at redhat.com> wrote:
> Xiomara.Jayasena at Sun.COM wrote:
>  > On 11/24/08 08:00, Andrew Haley wrote:
>  >> Xiomara Jayasena wrote:
>  >>
>  >>> Hi,
>  >>>
>  >>> The official Release Engineering builds for JDK 7 will be moving from
>  >>> the following OSs:
>  >>>
>  >>> *32 bit builds*
>  >>> ==========
>  >>> *From: *RH AS 2.1 to Fedora 9
>  >>>
>  >>> *64 bit builds*
>  >>> ==========
>  >>> *From: *SUSE 8 to: Fedora 9
>  >>>
>  >>> All required Makefile changes are in place, there are still  other items
>  >>> that are still being investigated for this OS upgrade to happen but
>  >>> wanted to inform of the changes that are on the way.
>  >>> *When:*  It is expected that this change will happen by build 42.
>  >>>
>  >>> Please let me know if there are any questions.
>  >>>
>  >>
>  >> We've had to fix a few compatibility bugs in IcedTea.  Do you want us to
>  >> send you the patches?
>  >>
>  >
>  > Yes, please -- send me the patches.
>
>
> OK.
>
>  * icedtea-f2i-overflow.patch fixes some overflows that are undefined
>  behaviour in C++.
>
>  * icedtea-hotspot-citypeflow.patch fixes an incorrect use of an enum.
>
>  * icedtea-lib64.patch fixes directory search paths.
>
>  * icedtea-gcc-4.3.patch fixes some compilation errors.
>
>  * icedtea-no-bcopy.patch removes the definition of the BSD bcopy and bcmp
>  functions.
>
>  The first two are really important because without them g++ generates
>  bad code.
>
>
>  Andrew.
>
>

Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
(doko) who doesn't have an SCA in place.  The rest are from Red Hat.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From Xiomara.Jayasena at Sun.COM  Mon Nov 24 21:34:48 2008
From: Xiomara.Jayasena at Sun.COM (Xiomara Jayasena)
Date: Mon, 24 Nov 2008 21:34:48 -0800
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>
	<492ADA41.2060804@Sun.COM> <492AEFD4.6090706@redhat.com>
	<17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
Message-ID: <492B8E78.7010608@sun.com>

Andrew John Hughes wrote:
> On 24/11/2008, Andrew Haley <aph at redhat.com> wrote:
>   
>> Xiomara.Jayasena at Sun.COM wrote:
>>  > On 11/24/08 08:00, Andrew Haley wrote:
>>  >> Xiomara Jayasena wrote:
>>  >>
>>  >>> Hi,
>>  >>>
>>  >>> The official Release Engineering builds for JDK 7 will be moving from
>>  >>> the following OSs:
>>  >>>
>>  >>> *32 bit builds*
>>  >>> ==========
>>  >>> *From: *RH AS 2.1 to Fedora 9
>>  >>>
>>  >>> *64 bit builds*
>>  >>> ==========
>>  >>> *From: *SUSE 8 to: Fedora 9
>>  >>>
>>  >>> All required Makefile changes are in place, there are still  other items
>>  >>> that are still being investigated for this OS upgrade to happen but
>>  >>> wanted to inform of the changes that are on the way.
>>  >>> *When:*  It is expected that this change will happen by build 42.
>>  >>>
>>  >>> Please let me know if there are any questions.
>>  >>>
>>  >>
>>  >> We've had to fix a few compatibility bugs in IcedTea.  Do you want us to
>>  >> send you the patches?
>>  >>
>>  >
>>  > Yes, please -- send me the patches.
>>
>>
>> OK.
>>
>>  * icedtea-f2i-overflow.patch fixes some overflows that are undefined
>>  behaviour in C++.
>>
>>  * icedtea-hotspot-citypeflow.patch fixes an incorrect use of an enum.
>>
>>  * icedtea-lib64.patch fixes directory search paths.
>>
>>  * icedtea-gcc-4.3.patch fixes some compilation errors.
>>
>>  * icedtea-no-bcopy.patch removes the definition of the BSD bcopy and bcmp
>>  functions.
>>
>>  The first two are really important because without them g++ generates
>>  bad code.
>>
>>
>>  Andrew.
>>
>>
>>     
>
> Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
> icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
> (doko) who doesn't have an SCA in place.  The rest are from Red Hat.
>   

I believe an SCA sign by Matthias will be needed so the patches can be 
integrated.  Let me investigate and get back to doko at ... 


Thanks,
-Xiomara


-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081124/27db7d5b/attachment.html 

From martinrb at google.com  Mon Nov 24 22:07:33 2008
From: martinrb at google.com (Martin Buchholz)
Date: Mon, 24 Nov 2008 22:07:33 -0800
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>
	<492ADA41.2060804@Sun.COM> <492AEFD4.6090706@redhat.com>
	<17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
Message-ID: <1ccfd1c10811242207p28cf7108h121a15b9adb38f6@mail.gmail.com>

On Mon, Nov 24, 2008 at 21:19, Andrew John Hughes
<gnu_andrew at member.fsf.org> wrote:

> Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
> icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
> (doko) who doesn't have an SCA in place.  The rest are from Red Hat.

The citypeflow patch is already in openjdk.
There were several variations on this very small patch,
but the one in openjdk is the one authored by Google.

Martin


From Xiomara.Jayasena at Sun.COM  Mon Nov 24 22:27:44 2008
From: Xiomara.Jayasena at Sun.COM (Xiomara Jayasena)
Date: Mon, 24 Nov 2008 22:27:44 -0800
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <1ccfd1c10811242207p28cf7108h121a15b9adb38f6@mail.gmail.com>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>
	<492ADA41.2060804@Sun.COM> <492AEFD4.6090706@redhat.com>
	<17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
	<1ccfd1c10811242207p28cf7108h121a15b9adb38f6@mail.gmail.com>
Message-ID: <492B9AE0.80404@sun.com>

Martin Buchholz wrote:
> On Mon, Nov 24, 2008 at 21:19, Andrew John Hughes
> <gnu_andrew at member.fsf.org> wrote:
>
>   
>> Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
>> icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
>> (doko) who doesn't have an SCA in place.  The rest are from Red Hat.
>>     
>
> The citypeflow patch is already in openjdk.
>   

Thanks for the clarification, Martin. 

-Xiomara

> There were several variations on this very small patch,
> but the one in openjdk is the one authored by Google.
>
> Martin
>   

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081124/b5a90323/attachment.html 

From mark at klomp.org  Tue Nov 25 00:31:25 2008
From: mark at klomp.org (Mark Wielaard)
Date: Tue, 25 Nov 2008 08:31:25 +0000
Subject: changeset in /hg/icedtea6: * Makefile.am (jtregcheck): Fix regexp.
Message-ID: <hg.ec447dfa01f5.1227601885.2873452341184383832@icedtea.classpath.org>

changeset ec447dfa01f5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ec447dfa01f5
description:
	* Makefile.am (jtregcheck): Fix regexp.

diffstat:

2 files changed, 5 insertions(+), 1 deletion(-)
ChangeLog   |    4 ++++
Makefile.am |    2 +-

diffs (23 lines):

diff -r 0d528f5c93eb -r ec447dfa01f5 ChangeLog
--- a/ChangeLog	Mon Nov 24 21:52:30 2008 +0100
+++ b/ChangeLog	Tue Nov 25 09:31:17 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-24  Mark Wielaard  <mark at klomp.o
+2008-11-25  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (jtregcheck): Fix regexp.
+
 2008-11-24  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (jtregcheck): Clean up jtreg-summary.log a bit more.
diff -r 0d528f5c93eb -r ec447dfa01f5 Makefile.am
--- a/Makefile.am	Mon Nov 24 21:52:30 2008 +0100
+++ b/Makefile.am	Tue Nov 25 09:31:17 2008 +0100
@@ -1618,7 +1618,7 @@ jtregcheck: jtreg check-hotspot check-la
 jtregcheck: jtreg check-hotspot check-langtools check-jdk
 	for i in hotspot langtools jdk; do \
 	  echo "--------------- jtreg console summary for $$i ---------------"; \
-	  egrep -v '^(Passed:|Directory)|Re[a-z]+\ written\ to)' test/check-$$i.log; \
+	  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
 	done | tee test/jtreg-summary.log
 
 	: # kill testsuite processes still hanging


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 25 00:47:06 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 25 Nov 2008 08:47:06 +0000
Subject: [Bug 264] New: Class Cast exception on https://ibank.cib.hu
Message-ID: <E1L4tZa-0001Y3-Nr@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=264

           Summary: Class Cast exception on https://ibank.cib.hu
           Product: IcedTea
           Version: unspecified
          Platform: PC
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: mvyskocil at suse.cz


The hungarian bank not work with openjdk plugin. In error log I found a 

java.lang.ClassCastException: net.sourceforge.jnlp.runtime.JNLPSecurityManager
cannot be cast to sun.applet.AppletSecurity 

According javadoc [1] is the JNLPSecurityManager derived from
java.lang.SecurityManager, but the applet probably use some dirty casts, which
runs only in Sun JRE. Tested on opendjk b12, icedtea 1.3

[1]
http://jnlp.sourceforge.net/netx/javadoc/netx/jnlp/runtime/JNLPSecurityManager.html


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 25 00:48:55 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 25 Nov 2008 08:48:55 +0000
Subject: [Bug 264] Class Cast exception on https://ibank.cib.hu
Message-ID: <E1L4tbL-0001YE-Jf@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=264





------- Comment #1 from mvyskocil at suse.cz  2008-11-25 08:48 -------
Created an attachment (id=144)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=144&action=view)
The error log from firefox -jconsole


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 25 00:49:39 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 25 Nov 2008 08:49:39 +0000
Subject: [Bug 264] Class Cast exception on https://ibank.cib.hu
Message-ID: <E1L4tc3-0001YP-KN@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=264


mvyskocil at suse.cz changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
    Attachment #144|text/x-log                  |text/plain
          mime type|                            |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From aph at redhat.com  Tue Nov 25 01:52:47 2008
From: aph at redhat.com (Andrew Haley)
Date: Tue, 25 Nov 2008 09:52:47 +0000
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>	
	<492ADA41.2060804@Sun.COM> <492AEFD4.6090706@redhat.com>
	<17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
Message-ID: <492BCAEF.4040603@redhat.com>

Andrew John Hughes wrote:
> On 24/11/2008, Andrew Haley <aph at redhat.com> wrote:
>> Xiomara.Jayasena at Sun.COM wrote:
>>  > On 11/24/08 08:00, Andrew Haley wrote:
>>  >> Xiomara Jayasena wrote:
>>  >>
>>  >>> Hi,
>>  >>>
>>  >>> The official Release Engineering builds for JDK 7 will be moving from
>>  >>> the following OSs:
>>  >>>
>>  >>> *32 bit builds*
>>  >>> ==========
>>  >>> *From: *RH AS 2.1 to Fedora 9
>>  >>>
>>  >>> *64 bit builds*
>>  >>> ==========
>>  >>> *From: *SUSE 8 to: Fedora 9
>>  >>>
>>  >>> All required Makefile changes are in place, there are still  other items
>>  >>> that are still being investigated for this OS upgrade to happen but
>>  >>> wanted to inform of the changes that are on the way.
>>  >>> *When:*  It is expected that this change will happen by build 42.
>>  >>>
>>  >>> Please let me know if there are any questions.
>>  >>>
>>  >>
>>  >> We've had to fix a few compatibility bugs in IcedTea.  Do you want us to
>>  >> send you the patches?
>>  >>
>>  >
>>  > Yes, please -- send me the patches.
>>
>>
>> OK.
>>
>>  * icedtea-f2i-overflow.patch fixes some overflows that are undefined
>>  behaviour in C++.
>>
>>  * icedtea-hotspot-citypeflow.patch fixes an incorrect use of an enum.
>>
>>  * icedtea-lib64.patch fixes directory search paths.
>>
>>  * icedtea-gcc-4.3.patch fixes some compilation errors.
>>
>>  * icedtea-no-bcopy.patch removes the definition of the BSD bcopy and bcmp
>>  functions.
>>
>>  The first two are really important because without them g++ generates
>>  bad code.

> Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
> icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
> (doko) who doesn't have an SCA in place.  The rest are from Red Hat.

You shouldn't just say "no assignment, so we can't apply these" without
actually looking at the patches.

icedtea-no-bcopy.patch simply removes a few lines of code.  I am not a
lawyer, but IMO that doesn't need copyright assignment.

The citypeflow change is

   enum Cell {
-    Cell_0
+    Cell_0, Cell_max = UINT_MAX
   };

which is the trivial/obvious way to fix it.

Andrew.


From bugzilla-daemon at icedtea.classpath.org  Tue Nov 25 07:24:55 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 25 Nov 2008 15:24:55 +0000
Subject: [Bug 264] Class Cast exception on https://ibank.cib.hu
Message-ID: <E1L4zmZ-0001n9-4V@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=264


langel at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|dbhole at redhat.com
                   |.org                        |




-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are the assignee for the bug, or are watching the assignee.


From Xiomara.Jayasena at Sun.COM  Tue Nov 25 11:43:04 2008
From: Xiomara.Jayasena at Sun.COM (Xiomara.Jayasena at Sun.COM)
Date: Tue, 25 Nov 2008 11:43:04 -0800
Subject: BSD bcopy and bcmp
Message-ID: <492C5548.1040505@Sun.COM>


Does anyone have more in depth information on the reasons the patch 
below is needed?


Thanks,
-Xiomara

Xiomara.Jayasena at Sun.COM wrote:
> 
> Could you elaborate on the reasons
> 
> * icedtea-no-bcopy.patch removes the definition of the BSD bcopy and bcmp
> functions.
> 
> is needed?

I think it was a compile-time failure.
If it builds OK for you, I don't think it's so important.





From mark at klomp.org  Tue Nov 25 12:08:04 2008
From: mark at klomp.org (Mark Wielaard)
Date: Tue, 25 Nov 2008 21:08:04 +0100
Subject: BSD bcopy and bcmp
In-Reply-To: <492C5548.1040505@Sun.COM>
References: <492C5548.1040505@Sun.COM>
Message-ID: <1227643684.10165.1.camel@hermans.wildebeest.org>

Hi Xiomara,

On Tue, 2008-11-25 at 11:43 -0800, Xiomara.Jayasena at Sun.COM wrote:
> Does anyone have more in depth information on the reasons the patch 
> below is needed?

See the following thread:
http://thread.gmane.org/gmane.comp.java.openjdk.distro-packaging.devel/1802/focus=2400

Cheers,

Mark



From gnu_andrew at member.fsf.org  Tue Nov 25 22:06:06 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 26 Nov 2008 06:06:06 +0000
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <492BCAEF.4040603@redhat.com>
References: <490938A9.9050201@sun.com> <492ACF8C.9050109@redhat.com>
	<492ADA41.2060804@Sun.COM> <492AEFD4.6090706@redhat.com>
	<17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
	<492BCAEF.4040603@redhat.com>
Message-ID: <17c6771e0811252206o3fff4e7le13153b8fae805c4@mail.gmail.com>

2008/11/25 Andrew Haley <aph at redhat.com>:
> Andrew John Hughes wrote:
>> On 24/11/2008, Andrew Haley <aph at redhat.com> wrote:
>>> Xiomara.Jayasena at Sun.COM wrote:
>>>  > On 11/24/08 08:00, Andrew Haley wrote:
>>>  >> Xiomara Jayasena wrote:
>>>  >>
>>>  >>> Hi,
>>>  >>>
>>>  >>> The official Release Engineering builds for JDK 7 will be moving from
>>>  >>> the following OSs:
>>>  >>>
>>>  >>> *32 bit builds*
>>>  >>> ==========
>>>  >>> *From: *RH AS 2.1 to Fedora 9
>>>  >>>
>>>  >>> *64 bit builds*
>>>  >>> ==========
>>>  >>> *From: *SUSE 8 to: Fedora 9
>>>  >>>
>>>  >>> All required Makefile changes are in place, there are still  other items
>>>  >>> that are still being investigated for this OS upgrade to happen but
>>>  >>> wanted to inform of the changes that are on the way.
>>>  >>> *When:*  It is expected that this change will happen by build 42.
>>>  >>>
>>>  >>> Please let me know if there are any questions.
>>>  >>>
>>>  >>
>>>  >> We've had to fix a few compatibility bugs in IcedTea.  Do you want us to
>>>  >> send you the patches?
>>>  >>
>>>  >
>>>  > Yes, please -- send me the patches.
>>>
>>>
>>> OK.
>>>
>>>  * icedtea-f2i-overflow.patch fixes some overflows that are undefined
>>>  behaviour in C++.
>>>
>>>  * icedtea-hotspot-citypeflow.patch fixes an incorrect use of an enum.
>>>
>>>  * icedtea-lib64.patch fixes directory search paths.
>>>
>>>  * icedtea-gcc-4.3.patch fixes some compilation errors.
>>>
>>>  * icedtea-no-bcopy.patch removes the definition of the BSD bcopy and bcmp
>>>  functions.
>>>
>>>  The first two are really important because without them g++ generates
>>>  bad code.
>
>> Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
>> icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
>> (doko) who doesn't have an SCA in place.  The rest are from Red Hat.
>
> You shouldn't just say "no assignment, so we can't apply these" without
> actually looking at the patches.
>
> icedtea-no-bcopy.patch simply removes a few lines of code.  I am not a
> lawyer, but IMO that doesn't need copyright assignment.
>
> The citypeflow change is
>
>   enum Cell {
> -    Cell_0
> +    Cell_0, Cell_max = UINT_MAX
>   };
>
> which is the trivial/obvious way to fix it.
>
> Andrew.
>

I didn't.  I was just pointing out that this was a collection of
patches from different people, some of which weren't under the SCA.
>From the original e-mail, it might have been assumed that they were
all being contributed by you or Red Hat.  I wasn't saying that the SCA
was necessary for the contributions and I agree they are
trivial/obvious; I'd have applied similar patches to Classpath without
an assignment provided the same contributor didn't have a mass of
other existing small patches.  However, in my experience, Sun wants an
SCA for *every* contribution and I had to have one in place for a
similar one-liner.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From mark at klomp.org  Wed Nov 26 01:58:02 2008
From: mark at klomp.org (Mark Wielaard)
Date: Wed, 26 Nov 2008 09:58:02 +0000
Subject: changeset in /hg/icedtea6: * .hgignore: Add test/jtreg-summary.log.
Message-ID: <hg.c7a7e41ec581.1227693482.2873452341184383832@icedtea.classpath.org>

changeset c7a7e41ec581 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c7a7e41ec581
description:
	* .hgignore: Add test/jtreg-summary.log.

diffstat:

2 files changed, 5 insertions(+)
.hgignore |    1 +
ChangeLog |    4 ++++

diffs (22 lines):

diff -r ec447dfa01f5 -r c7a7e41ec581 .hgignore
--- a/.hgignore	Tue Nov 25 09:31:17 2008 +0100
+++ b/.hgignore	Wed Nov 26 10:57:55 2008 +0100
@@ -38,6 +38,7 @@ test/langtools
 test/langtools
 test/jtreg.jar
 test/jtreg/classes
+test/jtreg-summary.log
 test/check-.*log
 rt/com/sun/jdi/AbsentInformationException.java
 rt/com/sun/jdi/Accessible.java
diff -r ec447dfa01f5 -r c7a7e41ec581 ChangeLog
--- a/ChangeLog	Tue Nov 25 09:31:17 2008 +0100
+++ b/ChangeLog	Wed Nov 26 10:57:55 2008 +0100
@@ -1,3 +1,7 @@ 2008-11-25  Mark Wielaard  <mark at klomp.o
+2008-11-26  Mark Wielaard  <mark at klomp.org>
+
+	* .hgignore: Add test/jtreg-summary.log.
+
 2008-11-25  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (jtregcheck): Fix regexp.


From doko at ubuntu.com  Wed Nov 26 05:24:20 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Wed, 26 Nov 2008 14:24:20 +0100
Subject: Heads Up: JDK 7 Linux platforms moving to Fedora 9
In-Reply-To: <17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
References: <490938A9.9050201@sun.com>
	<492ACF8C.9050109@redhat.com>	<492ADA41.2060804@Sun.COM>
	<492AEFD4.6090706@redhat.com>
	<17c6771e0811242119t23c17041u2534ecd99c10c126@mail.gmail.com>
Message-ID: <492D4E04.7060208@ubuntu.com>

Andrew John Hughes schrieb:
> On 24/11/2008, Andrew Haley <aph at redhat.com> wrote:
>> Xiomara.Jayasena at Sun.COM wrote:
>>  > On 11/24/08 08:00, Andrew Haley wrote:

> Note that, according to the ChangeLog, icedtea-no-bcopy.patch and
> icedtea-hotspot-citypeflow.patch were contributed by Matthias Klose
> (doko) who doesn't have an SCA in place.  The rest are from Red Hat.

yes, the SCA is work in progress.

  Matthias


From bugzilla-daemon at icedtea.classpath.org  Thu Nov 27 11:49:12 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 27 Nov 2008 19:49:12 +0000
Subject: [Bug 262] Alt Graph doesnot generate any key event when pressing in
	French locale
Message-ID: <E1L5mrQ-0005B0-6I@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=262





------- Comment #1 from mercier.eric at gmail.com  2008-11-27 19:49 -------
This issue occur on Gnome 2.24.1, not on KDE 4.1


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.


From mark at klomp.org  Fri Nov 28 03:09:24 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 28 Nov 2008 12:09:24 +0100
Subject: Move autoconf version check to autogen.sh
Message-ID: <1227870564.3333.43.camel@dijkstra.wildebeest.org>

Hi,

We are using AC_PREREQ in configure.ac to check that we have autoconf
2.61. Sadly that causes warnings on NEWER versions of autoconf (like
2.63), sigh. So I moved the version check into autogen.sh instead:

2008-11-28  Mark Wielaard  <mark at klomp.org>

    * autogen.sh: Check for autoconf > 2.61.
    * configure.ac: Remove AC_PREREQ([2.61]).

Cheers,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: autoconf-check.patch
Type: text/x-patch
Size: 991 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081128/8c264885/autoconf-check.patch 

From mark at klomp.org  Fri Nov 28 03:10:07 2008
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 28 Nov 2008 11:10:07 +0000
Subject: changeset in /hg/icedtea6: * autogen.sh: Check for autoconf > 2.61.
Message-ID: <hg.87340a659b5a.1227870607.2873452341184383832@icedtea.classpath.org>

changeset 87340a659b5a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=87340a659b5a
description:
	* autogen.sh: Check for autoconf > 2.61.
		* configure.ac: Remove AC_PREREQ([2.61]).

diffstat:

3 files changed, 7 insertions(+), 3 deletions(-)
ChangeLog    |    5 +++++
autogen.sh   |    4 ++--
configure.ac |    1 -

diffs (41 lines):

diff -r c7a7e41ec581 -r 87340a659b5a ChangeLog
--- a/ChangeLog	Wed Nov 26 10:57:55 2008 +0100
+++ b/ChangeLog	Fri Nov 28 12:09:58 2008 +0100
@@ -1,3 +1,8 @@ 2008-11-26  Mark Wielaard  <mark at klomp.o
+2008-11-28  Mark Wielaard  <mark at klomp.org>
+
+	* autogen.sh: Check for autoconf > 2.61.
+	* configure.ac: Remove AC_PREREQ([2.61]).
+
 2008-11-26  Mark Wielaard  <mark at klomp.org>
 
 	* .hgignore: Add test/jtreg-summary.log.
diff -r c7a7e41ec581 -r 87340a659b5a autogen.sh
--- a/autogen.sh	Wed Nov 26 10:57:55 2008 +0100
+++ b/autogen.sh	Fri Nov 28 12:09:58 2008 +0100
@@ -11,7 +11,7 @@ for AUTOCONF in autoconf autoconf259; do
         AUTOCONF_VERSION=`${AUTOCONF} --version | sed 's/^[^0-9]*\([0-9.][0-9.]*\).*/\1/'`
 #        echo ${AUTOCONF_VERSION}
         case ${AUTOCONF_VERSION} in
-            2.59* | 2.6[0-9]* )
+            2.6[1-9]* )
                 HAVE_AUTOCONF=true
                 break;
                 ;;
@@ -55,7 +55,7 @@ done
 
 if test ${HAVE_AUTOCONF} = false; then
     echo "No proper autoconf was found."
-    echo "You must have autoconf 2.59 or later installed."
+    echo "You must have autoconf 2.61 or later installed."
     exit 1
 fi
 
diff -r c7a7e41ec581 -r 87340a659b5a configure.ac
--- a/configure.ac	Wed Nov 26 10:57:55 2008 +0100
+++ b/configure.ac	Fri Nov 28 12:09:58 2008 +0100
@@ -1,4 +1,3 @@ AC_PREREQ([2.61])
-AC_PREREQ([2.61])
 AC_INIT([icedtea6], [1.4], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.10 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])


From gbenson at redhat.com  Fri Nov 28 06:38:56 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 28 Nov 2008 14:38:56 +0000
Subject: changeset in /hg/icedtea6: 2008-11-28  Gary Benson  <gbenson@red...
Message-ID: <hg.11c9f28891ca.1227883136.2873452341184383832@icedtea.classpath.org>

changeset 11c9f28891ca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=11c9f28891ca
description:
	2008-11-28  Gary Benson  <gbenson at redhat.com>

		PR icedtea/261:
		* patches/icedtea-ecj-pr261.patch: New file.
		* Makefile.am (ICEDTEA_ECJ_PATCHES): Apply the above.
		* HACKING: Document the above.

diffstat:

4 files changed, 51 insertions(+), 2 deletions(-)
ChangeLog                       |    7 ++++++
HACKING                         |    3 +-
Makefile.am                     |    3 +-
patches/icedtea-ecj-pr261.patch |   40 +++++++++++++++++++++++++++++++++++++++

diffs (84 lines):

diff -r 87340a659b5a -r 11c9f28891ca ChangeLog
--- a/ChangeLog	Fri Nov 28 12:09:58 2008 +0100
+++ b/ChangeLog	Fri Nov 28 09:41:20 2008 -0500
@@ -1,3 +1,10 @@ 2008-11-28  Mark Wielaard  <mark at klomp.o
+2008-11-28  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/261:
+	* patches/icedtea-ecj-pr261.patch: New file.
+	* Makefile.am (ICEDTEA_ECJ_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2008-11-28  Mark Wielaard  <mark at klomp.org>
 
 	* autogen.sh: Check for autoconf > 2.61.
diff -r 87340a659b5a -r 11c9f28891ca HACKING
--- a/HACKING	Fri Nov 28 12:09:58 2008 +0100
+++ b/HACKING	Fri Nov 28 09:41:20 2008 -0500
@@ -94,7 +94,8 @@ The following patches are only applied t
   javac executable with Ant, remove -Werror from javac call, don't build JDK demos,
   don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
   calls, replace hexadecimal floating point literals with decimal variants in
-  java.lang.Double and java.lang.Float.   
+  java.lang.Double and java.lang.Float.
+* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar.
 
 The following patches are only applied for IcedTea builds using the zero-assembler:
 
diff -r 87340a659b5a -r 11c9f28891ca Makefile.am
--- a/Makefile.am	Fri Nov 28 12:09:58 2008 +0100
+++ b/Makefile.am	Fri Nov 28 09:41:20 2008 -0500
@@ -776,7 +776,8 @@ stamps/ports-ecj.stamp: stamps/extract-e
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCHES = patches/icedtea-ecj.patch \
 	patches/icedtea-ecj-spp.patch \
-	patches/icedtea-ecj-jopt.patch
+	patches/icedtea-ecj-jopt.patch \
+	patches/icedtea-ecj-pr261.patch
 
 stamps/patch-ecj.stamp: stamps/extract-ecj.stamp
 	mkdir -p stamps; \
diff -r 87340a659b5a -r 11c9f28891ca patches/icedtea-ecj-pr261.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-ecj-pr261.patch	Fri Nov 28 09:41:20 2008 -0500
@@ -0,0 +1,40 @@
+diff -r fa4572c7c75f openjdk-ecj/jdk/make/java/nio/Makefile
+--- openjdk-ecj/jdk/make/java/nio/Makefile	Thu Nov 27 08:42:23 2008 +0000
++++ openjdk-ecj/jdk/make/java/nio/Makefile	Thu Nov 27 10:12:08 2008 +0000
+@@ -85,6 +85,9 @@ ifeq ($(PLATFORM), linux)
+ ifeq ($(PLATFORM), linux)
+ FILES_java += \
+         sun/nio/ch/AbstractPollSelectorImpl.java \
++	sun/nio/ch/DevPollArrayWrapper.java \
++	sun/nio/ch/DevPollSelectorImpl.java \
++	sun/nio/ch/DevPollSelectorProvider.java \
+ 	sun/nio/ch/EPollArrayWrapper.java \
+ 	sun/nio/ch/EPollSelectorProvider.java \
+ 	sun/nio/ch/EPollSelectorImpl.java \
+@@ -99,6 +102,7 @@ FILES_c += \
+ 	NativeThread.c
+ 
+ FILES_export += \
++	sun/nio/ch/DevPollArrayWrapper.java \
+         sun/nio/ch/EPollArrayWrapper.java \
+ 	sun/nio/ch/InheritedChannel.java \
+ 	sun/nio/ch/NativeThread.java
+diff -r 3ee709488c6c openjdk-ecj/jdk/make/java/nio/FILES_java.gmk
+--- openjdk-ecj/jdk/make/java/nio/FILES_java.gmk	Thu Nov 27 10:16:56 2008 +0000
++++ openjdk-ecj/jdk/make/java/nio/FILES_java.gmk	Thu Nov 27 11:08:57 2008 +0000
+@@ -31,6 +31,7 @@ FILES_src = \
+ 	java/nio/StringCharBuffer.java \
+ 	\
+ 	java/nio/channels/ByteChannel.java \
++	java/nio/channels/CancelledKeyException.java \
+ 	java/nio/channels/Channel.java \
+ 	java/nio/channels/Channels.java \
+ 	java/nio/channels/DatagramChannel.java \
+@@ -38,6 +39,7 @@ FILES_src = \
+ 	java/nio/channels/FileLock.java \
+ 	java/nio/channels/GatheringByteChannel.java \
+ 	java/nio/channels/InterruptibleChannel.java \
++	java/nio/channels/Pipe.java \
+ 	java/nio/channels/ReadableByteChannel.java \
+ 	java/nio/channels/ScatteringByteChannel.java \
+ 	java/nio/channels/SelectableChannel.java \


From bugzilla-daemon at icedtea.classpath.org  Fri Nov 28 06:45:34 2008
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 28 Nov 2008 14:45:34 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1L64b8-0006Vy-Bz@icedtea.classpath.org>

http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=261


gbenson at redhat.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|                            |FIXED




------- Comment #8 from gbenson at redhat.com  2008-11-28 14:45 -------
Fixed in icedtea6-11c9f28891ca


-- 
Configure bugmail: http://icedtea.classpath.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.


From gbenson at redhat.com  Fri Nov 28 07:42:28 2008
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 28 Nov 2008 15:42:28 +0000
Subject: changeset in /hg/icedtea6: 2008-11-28  Gary Benson  <gbenson@red...
Message-ID: <hg.8ce80b4e9a73.1227886948.2873452341184383832@icedtea.classpath.org>

changeset 8ce80b4e9a73 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8ce80b4e9a73
description:
	2008-11-28  Gary Benson  <gbenson at redhat.com>

		PR icedtea/265:
		* patches/icedtea-6728542-epoll.patch: New file.
		* Makefile.am (ICEDTEA_PATCHES): Apply the above.
		* HACKING: Document the above.

diffstat:

4 files changed, 101 insertions(+), 2 deletions(-)
ChangeLog                           |    7 ++
HACKING                             |    3 -
Makefile.am                         |    3 -
patches/icedtea-6728542-epoll.patch |   90 +++++++++++++++++++++++++++++++++++

diffs (141 lines):

diff -r 11c9f28891ca -r 8ce80b4e9a73 ChangeLog
--- a/ChangeLog	Fri Nov 28 09:41:20 2008 -0500
+++ b/ChangeLog	Fri Nov 28 10:44:51 2008 -0500
@@ -1,3 +1,10 @@ 2008-11-28  Gary Benson  <gbenson at redhat
+2008-11-28  Gary Benson  <gbenson at redhat.com>
+
+	PR icedtea/265:
+	* patches/icedtea-6728542-epoll.patch: New file.
+	* Makefile.am (ICEDTEA_PATCHES): Apply the above.
+	* HACKING: Document the above.
+
 2008-11-28  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/261:
diff -r 11c9f28891ca -r 8ce80b4e9a73 HACKING
--- a/HACKING	Fri Nov 28 09:41:20 2008 -0500
+++ b/HACKING	Fri Nov 28 10:44:51 2008 -0500
@@ -74,6 +74,7 @@ The following patches are currently appl
 * icedtea-display-mode-changer.patch: Add extra test class.
 * icedtea-testenv.patch: Provide public reachable machines for net/nio tests.
 * icedtea-samejvm-safe.patch: Add samejvmsafe dirs to TEST.ROOT.
+* icedtea-6728542-epoll.patch: Make EPoll work on non-x86 platforms. (PR265)
 
 The following patches are only applied to OpenJDK6 in IcedTea6:
 
@@ -95,7 +96,7 @@ The following patches are only applied t
   don't run sun.awt.X11.ToBin, explicitly pull in timezone data and rt.jar in javac
   calls, replace hexadecimal floating point literals with decimal variants in
   java.lang.Double and java.lang.Float.
-* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar.
+* icedtea-ecj-pr261.patch: Adds a couple of classes that are omitted from rt.jar. (PR261)
 
 The following patches are only applied for IcedTea builds using the zero-assembler:
 
diff -r 11c9f28891ca -r 8ce80b4e9a73 Makefile.am
--- a/Makefile.am	Fri Nov 28 09:41:20 2008 -0500
+++ b/Makefile.am	Fri Nov 28 10:44:51 2008 -0500
@@ -541,7 +541,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-6761856-freetypescaler.patch \
 	patches/icedtea-display-mode-changer.patch \
 	patches/icedtea-testenv.patch \
-	patches/icedtea-samejvm-safe.patch
+	patches/icedtea-samejvm-safe.patch \
+	patches/icedtea-6728542-epoll.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 11c9f28891ca -r 8ce80b4e9a73 patches/icedtea-6728542-epoll.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6728542-epoll.patch	Fri Nov 28 10:44:51 2008 -0500
@@ -0,0 +1,90 @@
+
+# HG changeset patch
+# User alanb
+# Date 1219738992 -3600
+# Node ID 2a5377a6492e1738b4310c400d041a0f94071abf
+# Parent 872241636752db4f3c8401242a2dfe9f4ee38615
+6728542: (se) epoll based SelectorProvider should be portable to platforms other than x86 and x64
+Reviewed-by: sherman
+
+--- openjdk/jdk/make/java/nio/mapfile-linux	Mon Aug 25 08:11:08 2008 -0700
++++ openjdk/jdk/make/java/nio/mapfile-linux	Tue Aug 26 09:23:12 2008 +0100
+@@ -18,6 +18,8 @@ SUNWprivate_1.1 {
+ 		Java_sun_nio_ch_EPollArrayWrapper_fdLimit;
+ 		Java_sun_nio_ch_EPollArrayWrapper_init;
+ 		Java_sun_nio_ch_EPollArrayWrapper_interrupt;
++		Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
++		Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent;
+                 Java_sun_nio_ch_FileChannelImpl_close0;
+                 Java_sun_nio_ch_FileChannelImpl_force0;
+                 Java_sun_nio_ch_FileChannelImpl_initIDs;
+--- openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java	Mon Aug 25 08:11:08 2008 -0700
++++ openjdk/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java	Tue Aug 26 09:23:12 2008 +0100
+@@ -69,11 +69,11 @@ class EPollArrayWrapper {
+     static final int EPOLL_CTL_MOD      = 3;
+ 
+     // Miscellaneous constants
+-    static final short SIZE_EPOLLEVENT  = 12;
+-    static final short EVENT_OFFSET     = 0;
+-    static final short DATA_OFFSET      = 4;
+-    static final short FD_OFFSET        = 4;
+-    static final int   NUM_EPOLLEVENTS  = Math.min(fdLimit(), 8192);
++    static final int SIZE_EPOLLEVENT  = sizeofEPollEvent();
++    static final int EVENT_OFFSET     = 0;
++    static final int DATA_OFFSET      = offsetofData();
++    static final int FD_OFFSET        = DATA_OFFSET;
++    static final int NUM_EPOLLEVENTS  = Math.min(fdLimit(), 8192);
+ 
+     // Base address of the native pollArray
+     private final long pollArrayAddress;
+@@ -280,6 +280,8 @@ class EPollArrayWrapper {
+     private native void epollCtl(int epfd, int opcode, int fd, int events);
+     private native int epollWait(long pollAddress, int numfds, long timeout,
+                                  int epfd) throws IOException;
++    private static native int sizeofEPollEvent();
++    private static native int offsetofData();
+     private static native int fdLimit();
+     private static native void interrupt(int fd);
+     private static native void init();
+--- openjdk/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c	Mon Aug 25 08:11:08 2008 -0700
++++ openjdk/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c	Tue Aug 26 09:23:12 2008 +0100
+@@ -48,10 +48,18 @@ typedef union epoll_data {
+     __uint64_t u64;
+ } epoll_data_t;
+ 
++
++/* x86-64 has same alignment as 32-bit */
++#ifdef __x86_64__
++#define EPOLL_PACKED __attribute__((packed))
++#else
++#define EPOLL_PACKED
++#endif
++
+ struct epoll_event {
+     __uint32_t events;  /* Epoll events */
+     epoll_data_t data;  /* User data variable */
+-} __attribute__ ((__packed__));
++} EPOLL_PACKED;
+ 
+ #ifdef  __cplusplus
+ }
+@@ -143,6 +151,18 @@ Java_sun_nio_ch_EPollArrayWrapper_fdLimi
+     return (jint)rlp.rlim_max;
+ }
+ 
++JNIEXPORT jint JNICALL
++Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent(JNIEnv* env, jclass this)
++{
++    return sizeof(struct epoll_event);
++}
++
++JNIEXPORT jint JNICALL
++Java_sun_nio_ch_EPollArrayWrapper_offsetofData(JNIEnv* env, jclass this)
++{
++    return offsetof(struct epoll_event, data);
++}
++
+ JNIEXPORT void JNICALL
+ Java_sun_nio_ch_EPollArrayWrapper_epollCtl(JNIEnv *env, jobject this, jint epfd,
+                                            jint opcode, jint fd, jint events)
+


From aph at redhat.com  Fri Nov 28 09:58:14 2008
From: aph at redhat.com (Andrew Haley)
Date: Fri, 28 Nov 2008 17:58:14 +0000
Subject: changeset in /hg/icedtea6: 2008-11-28 Gary Benson <gbenson@red...
In-Reply-To: <hg.8ce80b4e9a73.1227886948.2873452341184383832@icedtea.classpath.org>
References: <hg.8ce80b4e9a73.1227886948.2873452341184383832@icedtea.classpath.org>
Message-ID: <49303136.3060508@redhat.com>

Gary Benson wrote:
> 
>  The following patches are only applied for IcedTea builds using the zero-assembler:
>  
> 
> +--- openjdk/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c	Mon Aug 25 08:11:08 2008 -0700
> ++++ openjdk/jdk/src/solaris/native/sun/nio/ch/EPollArrayWrapper.c	Tue Aug 26 09:23:12 2008 +0100
> +@@ -48,10 +48,18 @@ typedef union epoll_data {
> +     __uint64_t u64;
> + } epoll_data_t;
> + 
> ++
> ++/* x86-64 has same alignment as 32-bit */
> ++#ifdef __x86_64__
> ++#define EPOLL_PACKED __attribute__((packed))
> ++#else
> ++#define EPOLL_PACKED
> ++#endif
> ++
> + struct epoll_event {
> +     __uint32_t events;  /* Epoll events */
> +     epoll_data_t data;  /* User data variable */
> +-} __attribute__ ((__packed__));
> ++} EPOLL_PACKED;

This is a bug that will break other arches that use Zero.
We shouldn't be defining epoll_event and epoll_data.
Please #include <sys/epoll.h> instead.

Andrew.


From mark at klomp.org  Sun Nov 30 02:59:00 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 30 Nov 2008 10:59:00 +0000
Subject: changeset in /hg/icedtea6: Add Xrender pipeline support.
Message-ID: <hg.0da756c744c9.1228042740.2873452341184383832@icedtea.classpath.org>

changeset 0da756c744c9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0da756c744c9
description:
	Add Xrender pipeline support.

	2008-11-29  Mark Wielaard  <mark at klomp.org>

		* configure.ac: Add and check --enable-xrender.
		* Makefile.am: Add XRENDER_PATCHES when ENABLE_XRENDER set.
		* patches/icedtea-xrender-00[0-8].patch: New patches.
		* HACKING: Document new patches.

diffstat:

13 files changed, 12735 insertions(+)
ChangeLog                         |    7 
HACKING                           |    5 
Makefile.am                       |    5 
configure.ac                      |   18 
patches/icedtea-xrender-000.patch |  430 ++
patches/icedtea-xrender-001.patch | 5320 +++++++++++++++++++++++++++++++++++++
patches/icedtea-xrender-002.patch | 5199 ++++++++++++++++++++++++++++++++++++
patches/icedtea-xrender-003.patch |   78 
patches/icedtea-xrender-004.patch |   86 
patches/icedtea-xrender-005.patch |   18 
patches/icedtea-xrender-006.patch |  295 ++
patches/icedtea-xrender-007.patch | 1143 +++++++
patches/icedtea-xrender-008.patch |  131 

diffs (truncated from 12815 to 500 lines):

diff -r 8ce80b4e9a73 -r 0da756c744c9 ChangeLog
--- a/ChangeLog	Fri Nov 28 10:44:51 2008 -0500
+++ b/ChangeLog	Sun Nov 30 11:58:42 2008 +0100
@@ -1,3 +1,10 @@ 2008-11-28  Gary Benson  <gbenson at redhat
+2008-11-29  Mark Wielaard  <mark at klomp.org>
+
+	* configure.ac: Add and check --enable-xrender.
+	* Makefile.am: Add XRENDER_PATCHES when ENABLE_XRENDER set.
+	* patches/icedtea-xrender-00[0-8].patch: New patches.
+	* HACKING: Document new patches.
+
 2008-11-28  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/265:
diff -r 8ce80b4e9a73 -r 0da756c744c9 HACKING
--- a/HACKING	Fri Nov 28 10:44:51 2008 -0500
+++ b/HACKING	Sun Nov 30 11:58:42 2008 +0100
@@ -132,6 +132,11 @@ The following patches are only applied w
 
 * icedtea-cacao.patch: Don't run 'java' in a new thread.
 
+The following patches are to support Xrender pipeline (-Dsun.java2d.xrender):
+
+* icedtea-xrender-xxx.patch: Numbered patches from xrender branch
+  http://hg.openjdk.java.net/xrender/xrender/jdk
+
 Obsolete Patches
 ================
 
diff -r 8ce80b4e9a73 -r 0da756c744c9 Makefile.am
--- a/Makefile.am	Fri Nov 28 10:44:51 2008 -0500
+++ b/Makefile.am	Sun Nov 30 11:58:42 2008 +0100
@@ -561,6 +561,11 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-pulse-soundproperties.patch
 endif
 
+if ENABLE_XRENDER
+XRENDER_PATCHES = patches/icedtea-xrender-???.patch
+ICEDTEA_PATCHES += $(sort $(wildcard $(XRENDER_PATCHES)))
+endif
+
 ICEDTEA_PATCHES += \
 	$(DISTRIBUTION_PATCHES)
 
diff -r 8ce80b4e9a73 -r 0da756c744c9 configure.ac
--- a/configure.ac	Fri Nov 28 10:44:51 2008 -0500
+++ b/configure.ac	Sun Nov 30 11:58:42 2008 +0100
@@ -158,6 +158,14 @@ AC_ARG_ENABLE([docs],
 	      [ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes'])
 AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
 AC_MSG_RESULT(${ENABLE_DOCS})
+
+AC_MSG_CHECKING(whether to include xrender pipeline)
+AC_ARG_ENABLE([xrender],
+	      [AS_HELP_STRING([--disable-xrender],
+	      		      [Disable inclusion of xrender pipeline])],
+	      [ENABLE_XRENDER="${enableval}"], [ENABLE_XRENDER='yes'])
+AM_CONDITIONAL([ENABLE_XRENDER], [test x$ENABLE_XRENDER = xyes])
+AC_MSG_RESULT(${ENABLE_XRENDER})
 
 AC_MSG_CHECKING(whether to build VisualVM)
 AC_ARG_ENABLE([visualvm],
@@ -374,6 +382,16 @@ AC_SUBST(XINERAMA_CFLAGS)
 AC_SUBST(XINERAMA_CFLAGS)
 AC_SUBST(XINERAMA_LIBS)
 
+if test "x${ENABLE_XRENDER}" = "xyes"
+then
+  PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no])
+  if test "x${XRENDER_FOUND}" = xno
+  then
+    AC_MSG_ERROR([Could not find Xrender extension - \
+Try installing libXrender-devel or configure --disable-xrender.])
+  fi
+fi
+
 dnl Check for libpng headers and libraries.
 PKG_CHECK_MODULES(LIBPNG, libpng,[LIBPNG_FOUND=yes]
 	,[LIBPNG_FOUND=no])
diff -r 8ce80b4e9a73 -r 0da756c744c9 patches/icedtea-xrender-000.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xrender-000.patch	Sun Nov 30 11:58:42 2008 +0100
@@ -0,0 +1,430 @@
+6675596: SurfaceManagerFactory should allow plugging in different implementations
+Reviewed-by: tdv, campbell
+Contributed-by: Roman Kennke <roman.kennke at aicas.com>
+
+diff -r ed68352f7e42 -r 4af4867ed787 src/share/classes/sun/awt/image/SunVolatileImage.java
+--- openjdk/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java	Wed May 14 09:16:18 2008 -0700
++++ openjdk/jdk/src/share/classes/sun/awt/image/SunVolatileImage.java	Wed May 14 16:05:07 2008 -0700
+@@ -165,7 +165,8 @@
+         {
+             return new BufImgVolatileSurfaceManager(this, context);
+         }
+-        return SurfaceManagerFactory.createVolatileManager(this, context);
++        SurfaceManagerFactory smf = SurfaceManagerFactory.getInstance();
++        return smf.createVolatileManager(this, context);
+     }
+ 
+     private Color getForeground() {
+diff -r ed68352f7e42 -r 4af4867ed787 src/share/classes/sun/java2d/SurfaceManagerFactory.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/src/share/classes/sun/java2d/SurfaceManagerFactory.java	Wed May 14 16:05:07 2008 -0700
+@@ -0,0 +1,91 @@
++/*
++ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++package sun.java2d;
++
++import sun.awt.image.SunVolatileImage;
++import sun.awt.image.VolatileSurfaceManager;
++
++/**
++ * This factory creates platform specific VolatileSurfaceManager
++ * implementations.
++ *
++ * There are two platform specific SurfaceManagerFactories in OpenJDK,
++ * UnixSurfaceManagerFactory and WindowsSurfaceManagerFactory.
++ * The actually used SurfaceManagerFactory is set by the respective platform
++ * GraphicsEnvironment implementations in the static initializer.
++ */
++public abstract class SurfaceManagerFactory {
++
++    /**
++     * The single shared instance.
++     */
++    private static SurfaceManagerFactory instance;
++
++    /**
++     * Returns the surface manager factory instance. This returns a factory
++     * that has been set by {@link #setInstance(SurfaceManagerFactory)}.
++     *
++     * @return the surface manager factory
++     */
++    public synchronized static SurfaceManagerFactory getInstance() {
++
++        if (instance == null) {
++            throw new IllegalStateException("No SurfaceManagerFactory set.");
++        }
++        return instance;
++    }
++
++    /**
++     * Sets the surface manager factory. This may only be called once, and it
++     * may not be set back to {@code null} when the factory is already
++     * instantiated.
++     *
++     * @param factory the factory to set
++     */
++    public synchronized static void setInstance(SurfaceManagerFactory factory) {
++
++        if (factory == null) {
++            // We don't want to allow setting this to null at any time.
++            throw new IllegalArgumentException("factory must be non-null");
++        }
++
++        if (instance != null) {
++            // We don't want to re-set the instance at any time.
++            throw new IllegalStateException("The surface manager factory is already initialized");
++        }
++
++        instance = factory;
++    }
++
++    /**
++     * Creates a new instance of a VolatileSurfaceManager given any
++     * arbitrary SunVolatileImage.  An optional context Object can be supplied
++     * as a way for the caller to pass pipeline-specific context data to
++     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
++     */
++     public abstract VolatileSurfaceManager
++         createVolatileManager(SunVolatileImage image, Object context);
++}
+diff -r ed68352f7e42 -r 4af4867ed787 src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	Wed May 14 09:16:18 2008 -0700
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	Wed May 14 16:05:07 2008 -0700
+@@ -48,6 +48,8 @@
+ import sun.font.FontManager;
+ import sun.font.NativeFont;
+ import sun.java2d.SunGraphicsEnvironment;
++import sun.java2d.SurfaceManagerFactory;
++import sun.java2d.UnixSurfaceManagerFactory;
+ 
+ /**
+  * This is an implementation of a GraphicsEnvironment object for the
+@@ -177,6 +179,10 @@
+                 return null;
+             }
+          });
++
++        // Install the correct surface manager factory.
++        SurfaceManagerFactory.setInstance(new UnixSurfaceManagerFactory());
++
+     }
+ 
+     private static boolean glxAvailable;
+diff -r ed68352f7e42 -r 4af4867ed787 src/solaris/classes/sun/java2d/SurfaceManagerFactory.java
+--- openjdk/jdk/src/solaris/classes/sun/java2d/SurfaceManagerFactory.java	Wed May 14 09:16:18 2008 -0700
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,65 +0,0 @@
+-/*
+- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.  Sun designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Sun in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+- * CA 95054 USA or visit www.sun.com if you need additional information or
+- * have any questions.
+- */
+-
+-package sun.java2d;
+-
+-import java.awt.GraphicsConfiguration;
+-import java.awt.image.BufferedImage;
+-import sun.awt.X11GraphicsConfig;
+-import sun.awt.image.SunVolatileImage;
+-import sun.awt.image.SurfaceManager;
+-import sun.awt.image.VolatileSurfaceManager;
+-import sun.java2d.opengl.GLXGraphicsConfig;
+-import sun.java2d.opengl.GLXVolatileSurfaceManager;
+-import sun.java2d.x11.X11VolatileSurfaceManager;
+-
+-/**
+- * This is a factory class with static methods for creating a
+- * platform-specific instance of a particular SurfaceManager.  Each platform
+- * (Windows, Unix, etc.) has its own specialized SurfaceManagerFactory.
+- */
+-public class SurfaceManagerFactory {
+-    /**
+-     * Creates a new instance of a VolatileSurfaceManager given any
+-     * arbitrary SunVolatileImage.  An optional context Object can be supplied
+-     * as a way for the caller to pass pipeline-specific context data to
+-     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
+-     *
+-     * For Unix platforms, this method returns either an X11- or a GLX-
+-     * specific VolatileSurfaceManager based on the GraphicsConfiguration
+-     * under which the SunVolatileImage was created.
+-     */
+-    public static VolatileSurfaceManager
+-        createVolatileManager(SunVolatileImage vImg,
+-                              Object context)
+-    {
+-        GraphicsConfiguration gc = vImg.getGraphicsConfig();
+-        if (gc instanceof GLXGraphicsConfig) {
+-            return new GLXVolatileSurfaceManager(vImg, context);
+-        } else {
+-            return new X11VolatileSurfaceManager(vImg, context);
+-        }
+-    }
+-}
+diff -r ed68352f7e42 -r 4af4867ed787 src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/src/solaris/classes/sun/java2d/UnixSurfaceManagerFactory.java	Wed May 14 16:05:07 2008 -0700
+@@ -0,0 +1,64 @@
++/*
++ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++
++package sun.java2d;
++
++import java.awt.GraphicsConfiguration;
++
++import sun.awt.image.SunVolatileImage;
++import sun.awt.image.VolatileSurfaceManager;
++import sun.java2d.opengl.GLXGraphicsConfig;
++import sun.java2d.opengl.GLXVolatileSurfaceManager;
++import sun.java2d.x11.X11VolatileSurfaceManager;
++
++/**
++ * The SurfaceManagerFactory that creates VolatileSurfaceManager
++ * implementations for the Unix volatile images.
++ */
++public class UnixSurfaceManagerFactory extends SurfaceManagerFactory {
++
++    /**
++     * Creates a new instance of a VolatileSurfaceManager given any
++     * arbitrary SunVolatileImage.  An optional context Object can be supplied
++     * as a way for the caller to pass pipeline-specific context data to
++     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
++     *
++     * For Unix platforms, this method returns either an X11- or a GLX-
++     * specific VolatileSurfaceManager based on the GraphicsConfiguration
++     * under which the SunVolatileImage was created.
++     */
++    public VolatileSurfaceManager createVolatileManager(SunVolatileImage vImg,
++                                                        Object context)
++    {
++        GraphicsConfiguration gc = vImg.getGraphicsConfig();
++        if (gc instanceof GLXGraphicsConfig) {
++            return new GLXVolatileSurfaceManager(vImg, context);
++        } else {
++            return new X11VolatileSurfaceManager(vImg, context);
++        }
++    }
++
++}
+diff -r ed68352f7e42 -r 4af4867ed787 src/windows/classes/sun/awt/Win32GraphicsEnvironment.java
+--- openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	Wed May 14 09:16:18 2008 -0700
++++ openjdk/jdk/src/windows/classes/sun/awt/Win32GraphicsEnvironment.java	Wed May 14 16:05:07 2008 -0700
+@@ -42,6 +42,8 @@
+ import sun.awt.windows.WToolkit;
+ import sun.font.FontManager;
+ import sun.java2d.SunGraphicsEnvironment;
++import sun.java2d.SurfaceManagerFactory;
++import sun.java2d.WindowsSurfaceManagerFactory;
+ import sun.java2d.windows.WindowsFlags;
+ 
+ /**
+@@ -64,6 +66,9 @@
+         WindowsFlags.initFlags();
+         initDisplayWrapper();
+         eudcFontFileName = getEUDCFontFile();
++
++        // Install correct surface manager factory.
++        SurfaceManagerFactory.setInstance(new WindowsSurfaceManagerFactory());
+     }
+ 
+     /**
+diff -r ed68352f7e42 -r 4af4867ed787 src/windows/classes/sun/java2d/SurfaceManagerFactory.java
+--- openjdk/jdk/src/windows/classes/sun/java2d/SurfaceManagerFactory.java	Wed May 14 09:16:18 2008 -0700
++++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
+@@ -1,64 +0,0 @@
+-/*
+- * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.  Sun designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Sun in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+- * CA 95054 USA or visit www.sun.com if you need additional information or
+- * have any questions.
+- */
+-
+-package sun.java2d;
+-
+-import java.awt.GraphicsConfiguration;
+-import java.awt.image.BufferedImage;
+-import sun.awt.image.SunVolatileImage;
+-import sun.awt.image.SurfaceManager;
+-import sun.awt.image.VolatileSurfaceManager;
+-import sun.java2d.opengl.WGLGraphicsConfig;
+-import sun.java2d.opengl.WGLVolatileSurfaceManager;
+-import sun.java2d.windows.WindowsFlags;
+-import sun.java2d.windows.WinVolatileSurfaceManager;
+-
+-/**
+- * This is a factory class with static methods for creating a
+- * platform-specific instance of a particular SurfaceManager.  Each platform
+- * (Windows, Unix, etc.) has its own specialized SurfaceManagerFactory.
+- */
+-public class SurfaceManagerFactory {
+-    /**
+-     * Creates a new instance of a VolatileSurfaceManager given any
+-     * arbitrary SunVolatileImage.  An optional context Object can be supplied
+-     * as a way for the caller to pass pipeline-specific context data to
+-     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
+-     *
+-     * For Windows platforms, this method returns a Windows-specific
+-     * VolatileSurfaceManager.
+-     */
+-    public static VolatileSurfaceManager
+-        createVolatileManager(SunVolatileImage vImg,
+-                              Object context)
+-    {
+-        GraphicsConfiguration gc = vImg.getGraphicsConfig();
+-        if (gc instanceof WGLGraphicsConfig) {
+-            return new WGLVolatileSurfaceManager(vImg, context);
+-        } else {
+-            return new WinVolatileSurfaceManager(vImg, context);
+-        }
+-    }
+-}
+diff -r ed68352f7e42 -r 4af4867ed787 src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/src/windows/classes/sun/java2d/WindowsSurfaceManagerFactory.java	Wed May 14 16:05:07 2008 -0700
+@@ -0,0 +1,64 @@
++/*
++ * Copyright 2003-2008 Sun Microsystems, Inc.  All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Sun designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Sun in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++package sun.java2d;
++
++import java.awt.GraphicsConfiguration;
++import java.awt.image.BufferedImage;
++import sun.awt.image.SunVolatileImage;
++import sun.awt.image.SurfaceManager;
++import sun.awt.image.VolatileSurfaceManager;
++import sun.java2d.opengl.WGLGraphicsConfig;
++import sun.java2d.opengl.WGLVolatileSurfaceManager;
++import sun.java2d.windows.WindowsFlags;
++import sun.java2d.windows.WinVolatileSurfaceManager;
++
++/**
++ * The SurfaceManagerFactory that creates VolatileSurfaceManager
++ * implementations for the Windows volatile images.
++ */
++public class WindowsSurfaceManagerFactory extends SurfaceManagerFactory {
++
++    /**
++     * Creates a new instance of a VolatileSurfaceManager given any
++     * arbitrary SunVolatileImage.  An optional context Object can be supplied
++     * as a way for the caller to pass pipeline-specific context data to
++     * the VolatileSurfaceManager (such as a backbuffer handle, for example).
++     *
++     * For Windows platforms, this method returns a Windows-specific
++     * VolatileSurfaceManager.


From mark at klomp.org  Sun Nov 30 03:43:53 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 30 Nov 2008 12:43:53 +0100
Subject: Xrender pipeline support merged into IcedTea6
Message-ID: <1228045433.4178.36.camel@dijkstra.wildebeest.org>

Hi,

As most of you probably know Clemens Eisserer has been working on an
alternative X11 rendering pipeline based on Xrender [1]. Although still
a work in progress the results are already stunning. Lots of Java2D
using applications are noticably faster (sometimes by a factor of 10!)
and running over a remote X connection now feels like it is all local.

Clemens has been pushing bug reports against the whole graphics stack
(graphics drivers, Xorg server, etc) to get it improved and I believe
his work is really pushing performance enhancements all over. I am
hoping that by including xrender as a default option in IcedTea and
being adopted by the various GNU/Linux distros these enhancements will
be accelerated.

The new Xrender pipeline is completely optional. If a user doesn't
activate it (-Dsun.java.xrender=True) then the old X11 pipeline is being
used. This makes it safe to include by default. With this more people
will be able to test it out and detect performance bottlenecks still
present. Clemens blog is a good source of information for those wanting
to test it out and getting more background on the underlying
technologies that make it all work (fast) [2].

Backporting to IcedTea6 was pretty easy. It depends on Roman's extension
to make the SurfaceManagerFactory allow plugging in different
implementations (included as icedtea-xrender-000.patch) and only the
initial drop (icedtea-xrender-001.patch) needed some adjustments to
apply cleanly. That patch also includes one minor bug fix [3]. The rest
of the included patches (icedtea-xrender-00[2-8].patch) are just the
commulative patches drawn from the xrender repository [4]. This should
make it easy to keep it up to date from the master repository by just
adding a new icedtea-xrender-xxx+1.patch for each new commit.

configure.ac and Makefile.am have been extended to check for
--enable-xrender (default yes) and the Xrender libraries and only apply
the patches when both are there.

2008-11-29  Mark Wielaard  <mark at klomp.org>

        * configure.ac: Add and check --enable-xrender.
        * Makefile.am: Add XRENDER_PATCHES when ENABLE_XRENDER set.
        * patches/icedtea-xrender-00[0-8].patch: New patches.
        * HACKING: Document new patches.

Changes applied attached (excluding the icedtea-xrender-xxx.patch
files).

Cheers,

Mark

[1]
http://mail.openjdk.java.net/pipermail/challenge-discuss/2008-March/000054.html
[2]
http://linuxhippy.blogspot.com/
[3]
http://mail.openjdk.java.net/pipermail/xrender-dev/2008-November/000011.html
[4]
http://hg.openjdk.java.net/xrender/xrender/jdk/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: xrender.patch
Type: text/x-patch
Size: 2105 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081130/d972f4dd/xrender.patch 

From mark at klomp.org  Sun Nov 30 13:54:33 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 30 Nov 2008 21:54:33 +0000
Subject: changeset in /hg/icedtea6: * Makefile.am (stamps/native-ecj.stam...
Message-ID: <hg.4924c505eff0.1228082073.2873452341184383832@icedtea.classpath.org>

changeset 4924c505eff0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4924c505eff0
description:
	* Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
		* javac.in: Use ecj binary if available and no native-ecj.

diffstat:

3 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    2 +-
javac.in    |    2 ++

diffs (36 lines):

diff -r 0da756c744c9 -r 4924c505eff0 ChangeLog
--- a/ChangeLog	Sun Nov 30 11:58:42 2008 +0100
+++ b/ChangeLog	Sun Nov 30 22:54:25 2008 +0100
@@ -1,3 +1,8 @@ 2008-11-29  Mark Wielaard  <mark at klomp.o
+2008-11-30  Mark Wielaard  <mark at klomp.org>
+
+	* Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
+	* javac.in: Use ecj binary if available and no native-ecj.
+
 2008-11-29  Mark Wielaard  <mark at klomp.org>
 
 	* configure.ac: Add and check --enable-xrender.
diff -r 0da756c744c9 -r 4924c505eff0 Makefile.am
--- a/Makefile.am	Sun Nov 30 11:58:42 2008 +0100
+++ b/Makefile.am	Sun Nov 30 22:54:25 2008 +0100
@@ -1125,7 +1125,7 @@ stamps/native-ecj.stamp:
 stamps/native-ecj.stamp: 
 	mkdir -p stamps ; \
 	if test "x${GCJ}" != "xno"; then \
-	  ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -o native-ecj \
+	  ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
 	    --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
 	fi ; \
 	touch stamps/native-ecj.stamp
diff -r 0da756c744c9 -r 4924c505eff0 javac.in
--- a/javac.in	Sun Nov 30 11:58:42 2008 +0100
+++ b/javac.in	Sun Nov 30 22:54:25 2008 +0100
@@ -32,6 +32,8 @@ fi
 
 if [ -e @abs_top_builddir@/native-ecj ] ; then
     @abs_top_builddir@/native-ecj -1.5 -nowarn $bcoption $NEW_ARGS ;
+elif [ ! -z "@ECJ@" ] ; then
+    @ECJ@ -1.5 -nowarn $bcoption $NEW_ARGS
 else
     CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
      @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS


From mark at klomp.org  Sun Nov 30 14:07:06 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 30 Nov 2008 23:07:06 +0100
Subject: Two small ecj tweaks
Message-ID: <1228082826.9466.8.camel@hermans.wildebeest.org>

Hi,

Two tweaks to make sure we have a fast bootstrap ecj available. This
makes sure that when we compile the ecj jar with gcj we use
-findirect-dispatch so any unresolved references in the jar itself don't
make the compilation fail (like what would happen with the
eclipse-ecj.jar from fedora 10). Also if we don't have a native-ecj (not
configured --with-gcj), but we did detect an ecj binary then use that
first before falling back on full interpretation with gij.

2008-11-30  Mark Wielaard  <mark at klomp.org>

    * Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
    * javac.in: Use ecj binary if available and no native-ecj.

Committed and pushed,

Mark
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ecj.patch
Type: text/x-patch
Size: 960 bytes
Desc: 
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20081130/ec15ee81/ecj.patch 

From mark at klomp.org  Sun Nov 30 15:35:21 2008
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 30 Nov 2008 23:35:21 +0000
Subject: changeset in /hg/icedtea6: * patches/icedtea-xrender-001.patch: ...
Message-ID: <hg.990fb5e4f060.1228088121.2873452341184383832@icedtea.classpath.org>

changeset 990fb5e4f060 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=990fb5e4f060
description:
	* patches/icedtea-xrender-001.patch: Remove !xrender bug fix.
	        * patches/icedtea-xrender-009.patch: New upstream patch, includes
	        bug fix.

diffstat:

3 files changed, 177 insertions(+), 1 deletion(-)
ChangeLog                         |    6 +
patches/icedtea-xrender-001.patch |    2 
patches/icedtea-xrender-009.patch |  170 +++++++++++++++++++++++++++++++++++++

diffs (199 lines):

diff -r 4924c505eff0 -r 990fb5e4f060 ChangeLog
--- a/ChangeLog	Sun Nov 30 22:54:25 2008 +0100
+++ b/ChangeLog	Mon Dec 01 00:34:53 2008 +0100
@@ -1,3 +1,9 @@ 2008-11-30  Mark Wielaard  <mark at klomp.o
+2008-11-30  Mark Wielaard  <mark at klomp.org>
+
+	* patches/icedtea-xrender-001.patch: Remove !xrender bug fix.
+	* patches/icedtea-xrender-009.patch: New upstream patch, includes
+	bug fix.
+
 2008-11-30  Mark Wielaard  <mark at klomp.org>
 
 	* Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
diff -r 4924c505eff0 -r 990fb5e4f060 patches/icedtea-xrender-001.patch
--- a/patches/icedtea-xrender-001.patch	Sun Nov 30 22:54:25 2008 +0100
+++ b/patches/icedtea-xrender-001.patch	Mon Dec 01 00:34:53 2008 +0100
@@ -156,7 +156,7 @@ diff -r dc592ff5af5e jdk/src/solaris/cla
 -                            doubleBuffer);
 +                         doubleBufferVisuals.contains(Integer.valueOf(visNum)));
 +                    
-+                    if(xrender)
++                    if(!xrender)
 +                    {
 +                        ret[i] = XRGraphicsConfig.getConfig(this, visNum, depth,
 +                                getConfigColormap(i, screen),
diff -r 4924c505eff0 -r 990fb5e4f060 patches/icedtea-xrender-009.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-xrender-009.patch	Mon Dec 01 00:34:53 2008 +0100
@@ -0,0 +1,170 @@
+
+# HG changeset patch
+# User ceisserer
+# Date 1228079698 -3600
+# Node ID c72b1c0435c0b262a78dea6ee7109634a82eb574
+# Parent 0ae86de6889ebd18b1a8f0232c50ce2c3049bc40
+- Improved performance of non-solid operations
+- Improved performance of GPUs not supporting A8+A8 composition, but are capable of XCopyArea'ing with A8->A8 with their 2D engines (i830, GF6/7)
+- X11/XR pipeline initialization in X11GraphicsDevice was mixed up
+
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	Thu Oct 23 19:11:45 2008 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java	Sun Nov 30 22:14:58 2008 +0100
+@@ -151,7 +151,7 @@ public class X11GraphicsDevice
+             }
+ 
+             boolean glxSupported = X11GraphicsEnvironment.isGLXAvailable();
+-            boolean xrender = X11GraphicsEnvironment.isXRenderAvailable();
++            boolean xrenderSupported = X11GraphicsEnvironment.isXRenderAvailable();
+             
+             boolean dbeSupported = isDBESupported();
+             if (dbeSupported && doubleBufferVisuals == null) {
+@@ -169,7 +169,7 @@ public class X11GraphicsDevice
+                         (dbeSupported &&
+                          doubleBufferVisuals.contains(Integer.valueOf(visNum)));
+                     
+-                    if(!xrender)
++                    if(xrenderSupported)
+                     {
+                         ret[i] = XRGraphicsConfig.getConfig(this, visNum, depth,
+                                 getConfigColormap(i, screen),
+--- openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java	Thu Oct 23 19:11:45 2008 +0200
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRMaskFill.java	Sun Nov 30 22:14:58 2008 +0100
+@@ -104,6 +104,7 @@ public class XRMaskFill extends MaskFill
+ 
+ 	    maskFill(sData.getNativeOps(), x, y, w, h, maskoff, maskscan,
+ 		    mask != null ? mask.length : 0, mask);
++	
+ 	} finally {
+ 	    SunToolkit.awtUnlock();
+ 	}
+--- openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java	Thu Oct 23 19:11:45 2008 +0200
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRPMBlitLoops.java	Sun Nov 30 22:14:58 2008 +0100
+@@ -211,6 +211,7 @@ class X11PMTransformedBlit extends Trans
+ 		lastMaskHeight = maskHeight;
+ 	    } else {
+ 		int repeat = xrInterpolationType <= XRUtils.FAST ? XRUtils.RepeatNone : XRUtils.RepeatPad;
++		
+ 		x11sdSrc.validateAsSource(trx, repeat, xrInterpolationType);
+ 		XRPMBlitLoops.nativeTransformedRenderBlit(src.getNativeOps(), dst.getNativeOps(), 0, 0, bounds.x, bounds.y, bounds.width,
+ 			bounds.height, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0);
+--- openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java	Thu Oct 23 19:11:45 2008 +0200
++++ openjdk/jdk/src/solaris/classes/sun/java2d/xr/XRSurfaceData.java	Sun Nov 30 22:14:58 2008 +0100
+@@ -399,23 +399,6 @@ public abstract class XRSurfaceData exte
+ 	this.preferredInterpolation = interpolation;
+     }
+ 
+-    /*
+-     * For now those shape-clips are used for transformed images, because
+-     * transformed image for now would invalidate a much larger area that they
+-     * are intended to do. However as soon as the transformed-mask approach I am
+-     * working on turns out to work well, those will be dropped.
+-     */
+-    public void setShapeClip(Shape shape) {
+-	Region shapeClip = Region.getInstance(validatedClip, shape, null);
+-	XRSetClip(getNativeOps(), shapeClip.getLoX(), shapeClip.getLoY(), shapeClip.getHiX(), shapeClip.getHiY(), shapeClip.isRectangular() ? null
+-		: shapeClip);
+-    }
+-
+-    public void resetShapeClip() {
+-	XRSetClip(getNativeOps(), validatedClip.getLoX(), validatedClip.getLoY(), validatedClip.getHiX(), validatedClip.getHiY(), validatedClip
+-		.isRectangular() ? null : validatedClip);
+-    }
+-
+     /**
+      * Validate the source with the preferred interpolation set sometimes
+      * earlier.
+@@ -432,32 +415,25 @@ public abstract class XRSurfaceData exte
+      * applied when used as source as well as destination.
+      */
+     void validateAsSource(AffineTransform sxForm, int repeat, int interpolation) {
+-	// System.out.println("Source:
+-	// "+getBounds().width+"/"+getBounds().height);
+ 
+ 	if (validatedClip != null) {
+ 	    validatedClip = null;
+ 	    XRResetClip(getNativeOps());
+-	    // System.out.println("Clip ge-reseted");
+ 	}
+ 
+ 	if (validatedRepeat != repeat) {
+ 	    validatedRepeat = repeat;
+ 	    XRSetRepeat(getNativeOps(), repeat);
+-	    // System.out.println("Repeat ge-reseted");
+ 	}
+ 
+ 	if (sxForm == null) {
+ 	    if (transformInUse) {
+ 		validatedSourceTransform.setToIdentity();
+-		// System.out.println("Transform ge-reseted");
+ 		XRSetTransform(validatedSourceTransform);
+ 		transformInUse = false;
+ 	    }
+ 	} else {
+ 	    if (!transformInUse || (transformInUse && !sxForm.equals(validatedSourceTransform))) {
+-
+-		// System.out.println("Setze transform: "+sxForm);
+ 
+ 		validatedSourceTransform.setTransform(sxForm.getScaleX(), sxForm.getShearY(), sxForm.getShearX(), sxForm.getScaleY(), sxForm
+ 			.getTranslateX(), sxForm.getTranslateY());
+@@ -677,7 +653,7 @@ public abstract class XRSurfaceData exte
+ 	} catch (NoninvertibleTransformException ex) {
+ 	    at.setToIdentity(); /* TODO: Right thing to do in this case? */
+ 	}
+-
++	
+ 	x11SrcData.validateAsSource(at, XRUtils.RepeatNormal, XRUtils.ATransOpToXRQuality(sg2d.interpolationType));
+ 
+ 	XRSetTexturePaint(srcData.getNativeOps());
+@@ -739,6 +715,8 @@ public abstract class XRSurfaceData exte
+ 	// validate clip
+ 	if (updateClip) {
+ 	    if (clip != null) {
++		//    System.out.println("Set paint clip: "+getBounds().width+":"+getBounds().height);
++		//    Thread.dumpStack();
+ 		XRSetClip(getNativeOps(), clip.getLoX(), clip.getLoY(), clip.getHiX(), clip.getHiY(), clip.isRectangular() ? null : clip);
+ 	    } else {
+ 		XRResetClip(getNativeOps());
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/MaskBuffer.c	Thu Oct 23 19:11:45 2008 +0200
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/MaskBuffer.c	Sun Nov 30 22:14:58 2008 +0100
+@@ -77,12 +77,14 @@ MaskBuffer* initMaskBuffer(Window window
+ 
+   buffer->validatedGCAlpha = 1.0f;
+   XGCValues values;
++  values.graphics_exposures = 0;
++
+   values.foreground = 255;
+-  buffer->drawLineGC = XCreateGC(awt_display, buffer->lineMaskPixmap, GCForeground, &values);
++  buffer->drawLineGC = XCreateGC(awt_display, buffer->lineMaskPixmap, GCForeground | GCGraphicsExposures, &values);
+   /*Invisible GC for readback assistance*/
+   values.foreground = 0;
+-  buffer->clearLineGC = XCreateGC(awt_display, buffer->lineMaskPixmap, GCForeground, &values);
+-  buffer->maskGC = XCreateGC(awt_display, buffer->maskPixmap, 0, &values);
++  buffer->clearLineGC = XCreateGC(awt_display, buffer->lineMaskPixmap, GCForeground | GCGraphicsExposures, &values);
++  buffer->maskGC = XCreateGC(awt_display, buffer->maskPixmap, GCGraphicsExposures, &values);
+  
+   buffer->alphaData = malloc(32*32);
+   buffer->alphaImg = XCreateImage(awt_display, &buffer->maskPixmap, 8, ZPixmap, 0, (char *) buffer->alphaData, 32, 32, 8, 0);
+@@ -376,7 +378,11 @@ void fillMask(MaskBuffer* buf, Picture d
+             }
+ 
+             if(rectList->used > 0) {
+-               XRenderComposite (awt_display, PictOpSrc, buf->lineMaskPicture, None, buf->maskPicture, tile->dirtyLineArea.x, tile->dirtyLineArea.y, 0, 0, tile->dirtyLineArea.x, tile->dirtyLineArea.y, (tile->dirtyLineArea.x2 - tile->dirtyLineArea.x), (tile->dirtyLineArea.y2 - tile->dirtyLineArea.y)); 
++               if(lineList->used > 0) {
++                 XCopyArea(awt_display, buf->lineMaskPixmap, buf->maskPixmap, buf->maskGC, tile->dirtyLineArea.x, tile->dirtyLineArea.y, (tile->dirtyLineArea.x2 - tile->dirtyLineArea.x), (tile->dirtyLineArea.y2 - tile->dirtyLineArea.y), tile->dirtyLineArea.x, tile->dirtyLineArea.y);
++                 //XRenderComposite (awt_display, PictOpSrc, buf->lineMaskPicture, None, buf->maskPicture, tile->dirtyLineArea.x, tile->dirtyLineArea.y, 0, 0, tile->dirtyLineArea.x, tile->dirtyLineArea.y, (tile->dirtyLineArea.x2 - tile->dirtyLineArea.x), (tile->dirtyLineArea.y2 - tile->dirtyLineArea.y)); 
++               }
++
+                XRenderFillRectangles (awt_display, PictOpSrc, buf->maskPicture, &maskColor, (XRectangle*) rectList->elements, rectList->used);
+                mask = buf->maskPicture;
+                clearXRList(rectList);
+@@ -389,7 +395,7 @@ void fillMask(MaskBuffer* buf, Picture d
+ 
+              /* Clear diagonal lines with lines again,
+                 to avoid the sysmem copy marked "dirty" causing migration for the next lines*/
+-             if(lineList->used != 0) {
++             if(lineList->used > 0) {
+                XDrawSegments(awt_display, buf->lineMaskPixmap, buf->clearLineGC, (XSegment *) lineList->elements, lineList->used);
+                clearXRList(lineList);
+ 	     }
+


From gnu_andrew at member.fsf.org  Sun Nov 30 19:06:03 2008
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 1 Dec 2008 03:06:03 +0000
Subject: Two small ecj tweaks
In-Reply-To: <1228082826.9466.8.camel@hermans.wildebeest.org>
References: <1228082826.9466.8.camel@hermans.wildebeest.org>
Message-ID: <17c6771e0811301906t1e3864d6jc1bd6bf9090ff458@mail.gmail.com>

On 30/11/2008, Mark Wielaard <mark at klomp.org> wrote:
> Hi,
>
>  Two tweaks to make sure we have a fast bootstrap ecj available. This
>  makes sure that when we compile the ecj jar with gcj we use
>  -findirect-dispatch so any unresolved references in the jar itself don't
>  make the compilation fail (like what would happen with the
>  eclipse-ecj.jar from fedora 10). Also if we don't have a native-ecj (not
>  configured --with-gcj), but we did detect an ecj binary then use that
>  first before falling back on full interpretation with gij.
>
>  2008-11-30  Mark Wielaard  <mark at klomp.org>
>
>     * Makefile.am (stamps/native-ecj.stamp): Use -findirect-dispatch.
>     * javac.in: Use ecj binary if available and no native-ecj.
>
>  Committed and pushed,
>
>
>  Mark
>
>

Thanks for this.  I still wonder why we detect javac on ecj builds but
don't use it any more -- too many issues in the past I guess.

I would also suggest possibly adding -Dgnu.gcj.precompiled.db.path to
the interpreted invocation.  On at least Debian and Gentoo, the
mapping between ecj.jar and ecj.so is stored in the default database
but as far as I can see, it doesn't get used unless this option is
given.  I patched the Gentoo build today to pass
-Dgnu.gcj.precompiled.db.path=$(gcj-dbtool -p) to @JAVA@ and it gave a
very noticeable speedup.

I presume most people have IcedTea java on their path because that's
about the only way you wouldn't notice how incredibly slow the first
two builds (hotspot-tools and rt) are.  I force the use of java from
gcj-jdk to ensure we still build on gcj and this is very slow without
some form of native compilation either prior to or during the build.
-- 
Andrew :-)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8


From doko at ubuntu.com  Sun Nov 30 23:31:09 2008
From: doko at ubuntu.com (Matthias Klose)
Date: Mon, 01 Dec 2008 08:31:09 +0100
Subject: Two small ecj tweaks
In-Reply-To: <17c6771e0811301906t1e3864d6jc1bd6bf9090ff458@mail.gmail.com>
References: <1228082826.9466.8.camel@hermans.wildebeest.org>
	<17c6771e0811301906t1e3864d6jc1bd6bf9090ff458@mail.gmail.com>
Message-ID: <493392BD.8020903@ubuntu.com>

Andrew John Hughes schrieb:
> I would also suggest possibly adding -Dgnu.gcj.precompiled.db.path to
> the interpreted invocation.  On at least Debian and Gentoo, the
> mapping between ecj.jar and ecj.so is stored in the default database
> but as far as I can see, it doesn't get used unless this option is
> given.  I patched the Gentoo build today to pass
> -Dgnu.gcj.precompiled.db.path=$(gcj-dbtool -p) to @JAVA@ and it gave a
> very noticeable speedup.

On Debian you have almost always ecj-gcj installed, the natively compiled binary
(dependency on java-gcj-compat-dev); in this case you won't see accesses to the
compiled library file. Is libecj-java-gcj installed as well?

  Matthias