From xerxes at zafena.se  Mon Feb  1 00:50:46 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 01 Feb 2010 09:50:46 +0100
Subject: RTC Thumb2 JIT methods containing exc handlers (take 2)
In-Reply-To: <201001291742.o0THgFVQ007168@mint.camswl.com>
References: <201001291742.o0THgFVQ007168@mint.camswl.com>
Message-ID: <4B6695E6.6060608@zafena.se>

ed at camswl.com wrote:
> Hi folks,
>
> Well, overnight testing with the previous proposed patch to JIT methods containing
> exception handlers showed up a few problems.
>
> 1) With nested try catch the exception could be thrown to the outermost catch
> instead of the one it actually occured in.
>
> 2) The function Thumb2_lr_to_bci returned 0 if it could not find a matching
> entry in the exception table. Unfortunately 0 is a valid byte code index.
> Changed to return -1, and calling code updated to catch -1.
>
> 3) When an exception occurs some of the local variable may be cached in ARM
> registers because they have been register allocated. The exception handling
> code continues in the interpreter so these need to be decached. This is done
> by having a register map in the compiled method header to enable the
> JITs exception handle do determine which locals were in which registers.
>
> Other changes:
>
> - Copyright notices updated to 2010 and added to thumb2.cpp
> - assertions turned off in PRODUCT build
> - Compilation summary and statistics output to stderr instead of stdout
>
> I have put 3 binaries of the Thumb2 JIT at
>
> http://mint.camswl.com/libjvm-1.so.gz
> http://mint.camswl.com/libjvm-100.so.gz
> http://mint.camswl.com/libjvm-10000.so.gz
>
> The difference between the 3 binaries is that the -1 version has the compile
> threshold set to 1, the -100 has it set to 100 etc. The default for a PRODUCT
> build is to set it to 10000.
>
> It is possible to change the compile threshold with the -XX:CompileThreshold=N
> flag, however, sometimes it is difficult to do this if you are say running a
> plugin within a broswer.
>
> The most useful one to test is the -100 version. The -1 version 'compiles the
> world' so it quickly runs out of buffer space and simply stops compiling. In
> addition when you run -1 none of the invokes are resolved when compiling. In
> this case (for an unresolved invoke) the JIT simply calls out to the interpreter.
>
> OK to commit?
>
> Regards,
> Ed.
>   
Looks ok.
It compiles, runs, and bootstraps OpenJDK builds quickly on armv7 hardware,
please commit!

Xerxes


From xerxes at zafena.se  Mon Feb  1 02:10:43 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 01 Feb 2010 11:10:43 +0100
Subject: RFC: [patch] Update shark for LLVM r94686 API change.
Message-ID: <4B66A8A3.8050905@zafena.se>

The attached updates Shark for LLVM r94686 API change.
The use of llvm context module_providers have been removed to fix some
subtile performance related LLVM JIT bugs
(http://llvm.org/bugs/show_bug.cgi?id=5737 and
http://llvm.org/bugs/show_bug.cgi?id=5735).
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html

Ok to commit?

Xerxes

2010-02-01  Xerxes R?nby  <xerxes at zafena.se>

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
    (SharkCompiler::SharkCompiler): Use sharkContext::module
    instead of sharkContext::module_provider when using LLVM 2.7
    to handle LLVM r94686 API change.
    * ports/hotspot/src/share/vm/shark/sharkContext.hpp
    (sharkContext::module): Made public when using LLVM 2.7.
    (sharkContext::module_provider): Undefine when using LLVM 2.7.
    * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
    (llvm/ModuleProvider.h): Undefine when using LLVM 2.7.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: r94686.patch
Type: text/x-patch
Size: 2567 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100201/48f9e473/r94686.patch 

From gbenson at redhat.com  Mon Feb  1 03:03:43 2010
From: gbenson at redhat.com (Gary Benson)
Date: Mon, 1 Feb 2010 11:03:43 +0000
Subject: RFC: [patch] Update shark for LLVM r94686 API change.
In-Reply-To: <4B66A8A3.8050905@zafena.se>
References: <4B66A8A3.8050905@zafena.se>
Message-ID: <20100201110342.GB4231@redhat.com>

Xerxes R?nby wrote:
> The attached updates Shark for LLVM r94686 API change.
> The use of llvm context module_providers have been removed to fix some
> subtile performance related LLVM JIT bugs
> (http://llvm.org/bugs/show_bug.cgi?id=5737 and
> http://llvm.org/bugs/show_bug.cgi?id=5735).
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html
> 
> Ok to commit?

In sharkContext.hpp, don't bother having separate identical module()
functions, just make it public if that's what's necessary.

Otherwise, yes :)

Cheers,
Gary

> Index: icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkContext.hpp
> ===================================================================
> --- icedtea6-shark.orig/ports/hotspot/src/share/vm/shark/sharkContext.hpp	2010-01-31 10:15:27.000000000 +0100
> +++ icedtea6-shark/ports/hotspot/src/share/vm/shark/sharkContext.hpp	2010-01-31 10:35:39.000000000 +0100
> @@ -36,11 +36,13 @@
>   private:
>    llvm::Module* _module;
>  
> +#if SHARK_LLVM_VERSION < 27
>   private:
>    llvm::Module* module() const
>    {
>      return _module;
>    }
> +#endif
>  
>    // Get this thread's SharkContext
>   public:
> @@ -51,10 +53,17 @@
>  
>    // Module accessors
>   public:
> +#if SHARK_LLVM_VERSION >= 27
> +  llvm::Module* module() const
> +  {
> +    return _module;
> +  }
> +#else
>    llvm::ModuleProvider* module_provider() const
>    {
>      return new llvm::ExistingModuleProvider(module());
>    }
> +#endif
>    void add_function(llvm::Function* function) const
>    {
>      module()->getFunctionList().push_back(function);


-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Mon Feb  1 03:11:01 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 11:11:01 +0000
Subject: [Bug 425] JAXP fails to build on ARM due to compliance level
Message-ID: <E1NbuBJ-0003nh-LN@icedtea.classpath.org>

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


steffen at s-bondorf.de changed:

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




------- Comment #2 from steffen at s-bondorf.de  2010-02-01 11:11 -------
That worked, thank you.


-- 
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 xranby at icedtea.classpath.org  Mon Feb  1 03:30:37 2010
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 11:30:37 +0000
Subject: /hg/icedtea6: Update Shark for LLVM r94686 API change.
Message-ID: <hg.22be2c99a89b.1265023836.2873452341184383832@icedtea.classpath.org>

changeset 22be2c99a89b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=22be2c99a89b
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Feb 01 12:28:24 2010 +0100

	Update Shark for LLVM r94686 API change.

	2010-02-01 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Use sharkContext::module
	instead of sharkContext::module_provider when using LLVM 2.7
	to handle LLVM r94686 API change.
		* ports/hotspot/src/share/vm/shark/sharkContext.hpp
	(sharkContext::module): Made public when using LLVM 2.7.
	(sharkContext::module_provider): Undefine when using LLVM 2.7.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.


diffstat:

4 files changed, 29 insertions(+), 1 deletion(-)
ChangeLog                                          |   12 ++++++++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    2 ++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    8 ++++++++
ports/hotspot/src/share/vm/shark/sharkContext.hpp  |    8 +++++++-

diffs (84 lines):

diff -r ec2ae0d51146 -r 22be2c99a89b ChangeLog
--- a/ChangeLog	Sat Jan 30 01:38:48 2010 +0000
+++ b/ChangeLog	Mon Feb 01 12:28:24 2010 +0100
@@ -1,3 +1,15 @@ 2010-01-29 Andrew John Hughes  <ahughes@
+2010-02-01  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Use sharkContext::module
+	instead of sharkContext::module_provider when using LLVM 2.7
+	to handle LLVM r94686 API change.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp
+	(sharkContext::module): Made public when using LLVM 2.7.
+	(sharkContext::module_provider): Undefine when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
+	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.
+
 2010-01-29 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add INITIAL_BOOTSTRAP_LINK_STAMP
diff -r ec2ae0d51146 -r 22be2c99a89b ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Sat Jan 30 01:38:48 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Mon Feb 01 12:28:24 2010 +0100
@@ -34,7 +34,9 @@
 #include <llvm/Instructions.h>
 #include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
+#if SHARK_LLVM_VERSION < 27
 #include <llvm/ModuleProvider.h>
+#endif
 #include <llvm/Support/IRBuilder.h>
 #include <llvm/System/Threading.h>
 #include <llvm/Target/TargetSelect.h>
diff -r ec2ae0d51146 -r 22be2c99a89b ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Sat Jan 30 01:38:48 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Feb 01 12:28:24 2010 +0100
@@ -52,11 +52,19 @@ SharkCompiler::SharkCompiler()
   _memory_manager = new SharkMemoryManager();
 
   // Create the JIT
+#if SHARK_LLVM_VERSION >= 27
+  _execution_engine = ExecutionEngine::createJIT(
+    _normal_context->module(),
+    NULL, memory_manager(), CodeGenOpt::Default);
+  execution_engine()->addModule(
+    _native_context->module());
+#else
   _execution_engine = ExecutionEngine::createJIT(
     _normal_context->module_provider(),
     NULL, memory_manager(), CodeGenOpt::Default);
   execution_engine()->addModuleProvider(
     _native_context->module_provider());
+#endif
 
   // All done
   mark_initialized();
diff -r ec2ae0d51146 -r 22be2c99a89b ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Sat Jan 30 01:38:48 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Mon Feb 01 12:28:24 2010 +0100
@@ -36,7 +36,11 @@ class SharkContext : public llvm::LLVMCo
  private:
   llvm::Module* _module;
 
- private:
+#if SHARK_LLVM_VERSION >= 27
+ public:
+#else
+ private:
+#endif
   llvm::Module* module() const
   {
     return _module;
@@ -51,10 +55,12 @@ class SharkContext : public llvm::LLVMCo
 
   // Module accessors
  public:
+#if SHARK_LLVM_VERSION < 27
   llvm::ModuleProvider* module_provider() const
   {
     return new llvm::ExistingModuleProvider(module());
   }
+#endif
   void add_function(llvm::Function* function) const
   {
     module()->getFunctionList().push_back(function);


From xerxes at zafena.se  Mon Feb  1 03:34:10 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Mon, 01 Feb 2010 12:34:10 +0100
Subject: RFC: [patch] Update shark for LLVM r94686 API change.
In-Reply-To: <20100201110342.GB4231@redhat.com>
References: <4B66A8A3.8050905@zafena.se> <20100201110342.GB4231@redhat.com>
Message-ID: <4B66BC32.7050204@zafena.se>

Gary Benson wrote:
> Xerxes R?nby wrote:
>   
>> The attached updates Shark for LLVM r94686 API change.
>> The use of llvm context module_providers have been removed to fix some
>> subtile performance related LLVM JIT bugs
>> (http://llvm.org/bugs/show_bug.cgi?id=5737 and
>> http://llvm.org/bugs/show_bug.cgi?id=5735).
>> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20100125/095204.html
>>
>> Ok to commit?
>>     
>
> In sharkContext.hpp, don't bother having separate identical module()
> functions, just make it public if that's what's necessary.
>
> Otherwise, yes :)
>
> Cheers,
> Gary
>
>   
Ok, changed as suggested and committed to:
http://icedtea.classpath.org/hg/icedtea6/rev/22be2c99a89b

Cheers,
Xerxes



From bugzilla-daemon at icedtea.classpath.org  Mon Feb  1 07:24:41 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:24:41 +0000
Subject: [Bug 381] Stackoverflow error with security manager,
	signed jars and -Djava.security.debug set
Message-ID: <E1Nby8n-0003gF-2Q@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|IcedTea6                    |CACAO
           Platform|other                       |All
            Version|unspecified                 |6-1.0




------- Comment #30 from gnu_andrew at member.fsf.org  2010-02-01 15:24 -------
http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/126b700b2af4


-- 
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 Feb  1 07:25:12 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:25:12 +0000
Subject: [Bug 381] Stackoverflow error with security manager,
	signed jars and -Djava.security.debug set
Message-ID: <E1Nby9I-0003mZ-50@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|CACAO                       |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  Mon Feb  1 07:25:44 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:25:44 +0000
Subject: [Bug 385] Regression in NPPlugin from icedtea6-1.6 - Runescape
	doesn't run
Message-ID: <E1Nby9o-0003ra-QS@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86




-- 
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 Feb  1 07:25:54 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:25:54 +0000
Subject: [Bug 390] ContestAppletProd.jnlp (Topcoder Arena Applet) crashes
	after launch
Message-ID: <E1Nby9y-0003t4-6j@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86_64




-- 
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 Feb  1 07:26:11 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:26:11 +0000
Subject: [Bug 391] Wrong jaxws drop md5sum in icedtea revision 05e6f20fb7fd
Message-ID: <E1NbyAF-0003wQ-Tp@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|IcedTea6                    |IcedTea7
           Platform|other                       |All
            Version|unspecified                 |7-hg




-- 
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 Feb  1 07:26:32 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:26:32 +0000
Subject: [Bug 393] 3D game shows with a too big scale
Message-ID: <E1NbyAa-0003zv-G2@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |All




-- 
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 Feb  1 07:27:00 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 01 Feb 2010 15:27:00 +0000
Subject: [Bug 401] OpenJDK 1.6 crashes on CentOS 5.4 x86_64 when running
	Eclipse 3.5
Message-ID: <E1NbyB2-00044o-Nr@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86_64
            Version|unspecified                 |6-1.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 enevill at icedtea.classpath.org  Tue Feb  2 03:08:55 2010
From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 11:08:55 +0000
Subject: /hg/icedtea6: Several bug fixes to compiling methods with except...
Message-ID: <hg.ba5d4644582d.1265108935.2873452341184383832@icedtea.classpath.org>

changeset ba5d4644582d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ba5d4644582d
author: Edward Nevill <ed at camswl.com>
date: Tue Feb 02 11:08:36 2010 +0000

	Several bug fixes to compiling methods with exception handlers


diffstat:

5 files changed, 242 insertions(+), 51 deletions(-)
ChangeLog                                          |    8 
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp       |    2 
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def    |    2 
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |   94 ++++++++--
ports/hotspot/src/cpu/zero/vm/thumb2.cpp           |  187 ++++++++++++++++----

diffs (truncated from 557 to 500 lines):

diff -r 22be2c99a89b -r ba5d4644582d ChangeLog
--- a/ChangeLog	Mon Feb 01 12:28:24 2010 +0100
+++ b/ChangeLog	Tue Feb 02 11:08:36 2010 +0000
@@ -1,3 +1,11 @@ 2010-02-01  Xerxes R??nby  <xerxes at zafen
+2010-02-02  Edward Nevill <ed at camswl.com>
+
+	* asm_helper.cpp, cppInterpreter_arm.S, thumb2.cpp, bytecodes_arm.def
+	Several bug fixes to compiled exection handling methods.
+	Copyright notices updated to 2010 and added to thumb2.cpp
+	Assertions turned off in PRODUCT build
+	Compilation summary and stats to stderr instead of stdout
+
 2010-02-01  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
diff -r 22be2c99a89b -r ba5d4644582d ports/hotspot/src/cpu/zero/vm/asm_helper.cpp
--- a/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	Mon Feb 01 12:28:24 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/asm_helper.cpp	Tue Feb 02 11:08:36 2010 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Edward Nevill
+ * Copyright 2009, 2010 Edward Nevill
  *
  * 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
diff -r 22be2c99a89b -r ba5d4644582d ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def
--- a/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Mon Feb 01 12:28:24 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def	Tue Feb 02 11:08:36 2010 +0000
@@ -1,4 +1,4 @@
-@ Copyright 2009 Edward Nevill
+@ Copyright 2009, 2010 Edward Nevill
 @ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 @
 @ This code is free software; you can redistribute it and/or modify it
diff -r 22be2c99a89b -r ba5d4644582d ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Mon Feb 01 12:28:24 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Tue Feb 02 11:08:36 2010 +0000
@@ -1,4 +1,4 @@
-@ Copyright 2009 Edward Nevill
+@ Copyright 2009, 2010 Edward Nevill
 @ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 @
 @ This code is free software; you can redistribute it and/or modify it
@@ -2996,9 +2996,12 @@ handle_exception:
 	DECACHE_JPC
 handle_exception_with_bcp:
 	bl	load_dispatch
+	CACHE_JPC
 	ldr	stack, [istate, #ISTATE_STACK_BASE]
 	sub	stack, stack, #4
 	DECACHE_STACK
+	cmp	jpc, #0
+	beq	1f
 
 	mov	r0, istate
 	ldr	r1, [istate, #ISTATE_THREAD]
@@ -6151,38 +6154,108 @@ dc_18:
 dc_18:
 	.word     0x38e38e39
 
+#define TBIT 1
+
 	.global	Thumb2_DivZero_Handler
 Thumb2_DivZero_Handler:
+#ifdef THUMB2EE
+
+#define JAZ_V1	r5
+#define JAZ_V2	r6
+#define JAZ_V3	r7
+#define	JAZ_V4	r10
+#define	JAZ_V5	r11
+
+#define JAZ_REGSET	JAZ_V1,JAZ_V2,JAZ_V3,JAZ_V4,JAZ_V5,ip
+#define JAZ_REGSET_LEN	6
+
 	adrl	r0, idiv_clz_ret
 	cmp	r0, lr
 	addne	r0, r0, #irem_clz_ret - idiv_clz_ret
 	cmpne	r0, lr
 	beq	divide_by_zero_exception
-	ldr	r0, [istate, #ISTATE_METHOD]
-        ldr     jpc, [r0, #METHOD_CONSTMETHOD]
+	stmdb	sp!, {JAZ_REGSET}
+	bic	r0, lr, #TBIT
+	ldr	r1, [istate, #ISTATE_METHOD]
+        ldr     jpc, [r1, #METHOD_CONSTMETHOD]
 	add	jpc, jpc, #CONSTMETHOD_CODEOFFSET
+	mov	r2, sp
+	ldr	r3, [istate, #ISTATE_LOCALS]
+	bl	Thumb2_lr_to_bci
+	add	sp, sp, #JAZ_REGSET_LEN * 4
+	cmp	r0, #-1
+	moveq	jpc, #0
+	addne	jpc, jpc, r0
 	bl	load_dispatch
+#endif // THUMB2EE
 	b	divide_by_zero_exception
 
 #ifdef THUMB2EE
 
 	.global	Thumb2_Handle_Exception
+	.global	Thumb2_Handle_Exception_NoRegs
 	.global	Thumb2_ArrayBounds_Handler
 	.global	Thumb2_NullPtr_Handler
 	.global Thumb2_Stack_Overflow
 Thumb2_ArrayBounds_Handler:
-	ldr	r0, [istate, #ISTATE_METHOD]
-        ldr     jpc, [r0, #METHOD_CONSTMETHOD]
+	stmdb	sp!, {JAZ_REGSET}
+	bic	r0, lr, #TBIT
+	ldr	r1, [istate, #ISTATE_METHOD]
+        ldr     jpc, [r1, #METHOD_CONSTMETHOD]
 	add	jpc, jpc, #CONSTMETHOD_CODEOFFSET
+	mov	r2, sp
+	ldr	r3, [istate, #ISTATE_LOCALS]
+	bl	Thumb2_lr_to_bci
+	add	sp, sp, #JAZ_REGSET_LEN * 4
+	cmp	r0, #-1
+	moveq	jpc, #0
+	addne	jpc, jpc, r0
 	bl	load_dispatch
 	mov	r0, #VMSYMBOLS_ArrayIndexOutOfBounds
 	b	raise_exception
 Thumb2_Handle_Exception:
-	ldr	r0, [istate, #ISTATE_METHOD]
-        ldr     jpc, [r0, #METHOD_CONSTMETHOD]
+	stmdb	sp!, {JAZ_REGSET}
+	bic	r0, lr, #TBIT
+	ldr	r1, [istate, #ISTATE_METHOD]
+        ldr     jpc, [r1, #METHOD_CONSTMETHOD]
 	add	jpc, jpc, #CONSTMETHOD_CODEOFFSET
+	mov	r2, sp
+	ldr	r3, [istate, #ISTATE_LOCALS]
+	bl	Thumb2_lr_to_bci
+	add	sp, sp, #JAZ_REGSET_LEN * 4
+	cmp	r0, #-1
+	moveq	jpc, #0
+	addne	jpc, jpc, r0
 	bl	load_dispatch
 	b	handle_exception
+Thumb2_Handle_Exception_NoRegs:
+	bic	r0, lr, #TBIT
+	ldr	r1, [istate, #ISTATE_METHOD]
+        ldr     jpc, [r1, #METHOD_CONSTMETHOD]
+	add	jpc, jpc, #CONSTMETHOD_CODEOFFSET
+	mov	r2, #0
+	bl	Thumb2_lr_to_bci
+	cmp	r0, #-1
+	moveq	jpc, #0
+	addne	jpc, jpc, r0
+	bl	load_dispatch
+	b	handle_exception
+Thumb2_NullPtr_Handler:
+	stmdb	sp!, {JAZ_REGSET}
+	bic	r0, lr, #TBIT
+	ldr	r1, [istate, #ISTATE_METHOD]
+        ldr     jpc, [r1, #METHOD_CONSTMETHOD]
+	add	jpc, jpc, #CONSTMETHOD_CODEOFFSET
+	mov	r2, sp
+	ldr	r3, [istate, #ISTATE_LOCALS]
+	bl	Thumb2_lr_to_bci
+	add	sp, sp, #JAZ_REGSET_LEN * 4
+	cmp	r0, #-1
+	moveq	jpc, #0
+	addne	jpc, jpc, r0
+	bl	load_dispatch
+	b	null_ptr_exception
+
 Thumb2_Stack_Overflow:
 	mov	r0, r2
 	ldr	ip, [r0, #THREAD_TOP_ZERO_FRAME]
@@ -6197,13 +6270,6 @@ Thumb2_Exit_To_Interpreter:
 	CACHE_CP
 	CACHE_LOCALS
 	DISPATCH	0
-
-Thumb2_NullPtr_Handler:
-	ldr	r0, [istate, #ISTATE_METHOD]
-        ldr     jpc, [r0, #METHOD_CONSTMETHOD]
-	add	jpc, jpc, #CONSTMETHOD_CODEOFFSET
-	bl	load_dispatch
-	b	null_ptr_exception
 
 	.global	Thumb2_Clear_Cache
 Thumb2_Clear_Cache:
diff -r 22be2c99a89b -r ba5d4644582d ports/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/ports/hotspot/src/cpu/zero/vm/thumb2.cpp	Mon Feb 01 12:28:24 2010 +0100
+++ b/ports/hotspot/src/cpu/zero/vm/thumb2.cpp	Tue Feb 02 11:08:36 2010 +0000
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2009, 2010 Edward Nevill
+ *
+ * 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.
+ */
+
 #ifdef THUMB2EE
 
 #define T2EE_PRINT_COMPILATION
@@ -363,7 +381,9 @@ static char *t2ee_print_regusage;
 
 #define H_STACK_OVERFLOW		59
 
-unsigned handlers[60];
+#define H_HANDLE_EXCEPTION_NO_REGS	60
+
+unsigned handlers[61];
 
 #define LEAF_STACK_SIZE			200
 #define STACK_SPARE			40
@@ -377,12 +397,7 @@ static jmp_buf compiler_error_env;
 
 #ifdef PRODUCT
 
-#define JASSERT(cond, msg)					\
-	do {							\
-	  if (!(cond))						\
-	    longjmp(compiler_error_env, COMPILER_RESULT_FATAL);	\
-	} while (0)
-
+#define JASSERT(cond, msg)	0
 #define J_Unimplemented() longjmp(compiler_error_env, COMPILER_RESULT_FATAL)
 
 #else
@@ -546,17 +561,22 @@ typedef struct Compiled_Method {
     // 		bl	fast_entry
     // 		pop	{r4, r5, r6, r7, r9, r10, r11, pc}
     unsigned slow_entry[3];
-    // osr_tablep:				@ pointer to the osr table
-    // 		.word	osr_table
-    unsigned *osr_table;
+    unsigned *osr_table;			// pointer to the osr table
+    unsigned *exception_table;
     Compiled_Method *next;
+    // The next 6 halfword give the register mapping for JAZ_V1 to JAZ_v5
+    // This is used when receovering from an exception so we can push
+    // the register back into the local variables pool.
+    short regusage[6];
     // OSR Entry point:
     // 	R0 = entry point within compiled method
-    // 	R1 = locals
+    // 	R1 = locals - 4000 * 4
     // 	R2 = thread
+    // 	R3 = locals - 31 * 4
     // osr_entry:
     // 		@ Load each local into it register allocated register
-    // 		ldr	<reg>, [R1, #-<local> * 4]
+    // 		ldr	<reg>, [R1, #(4000-<local>) * 4]
+    //    or	ldr	<reg>, [R3, #(31-<local>) * 4]
     // 		...
     // 		mov	Rthread, R2
     // 		bx	R0
@@ -4484,7 +4504,12 @@ int Thumb2_Accessor(Thumb2_Info *jinfo)
   out_32(jinfo->codebuf, 0);
 
   out_32(jinfo->codebuf, 0);	// pointer to osr table
+  out_32(jinfo->codebuf, 0);	// Space for exception_table pointer
   out_32(jinfo->codebuf, 0);	// next compiled method
+
+  out_32(jinfo->codebuf, 0);    // regusage
+  out_32(jinfo->codebuf, 0);
+  out_32(jinfo->codebuf, 0);
 
   // OSR entry point
   mov_reg(jinfo->codebuf, ARM_PC, ARM_R0);
@@ -4524,8 +4549,13 @@ void Thumb2_Enter(Thumb2_Info *jinfo)
   bl(jinfo->codebuf, out_pos(jinfo->codebuf) + CODE_ALIGN - 4);
   ldm(jinfo->codebuf, I_REGSET + (1<<ARM_PC), ARM_SP, POP_FD, 1);
 
-  out_32(jinfo->codebuf, 0);	// Space for osr_table point
+  out_32(jinfo->codebuf, 0);	// Space for osr_table pointer
+  out_32(jinfo->codebuf, 0);	// Space for exception_table pointer
   out_32(jinfo->codebuf, 0);	// Pointer to next method
+
+  out_32(jinfo->codebuf, 0);    // regusage
+  out_32(jinfo->codebuf, 0);
+  out_32(jinfo->codebuf, 0);
 
   // OSR entry point == Slow entry + 16 - caller save
   // R0 = entry point within compiled method
@@ -4577,7 +4607,7 @@ void Thumb2_Enter(Thumb2_Info *jinfo)
 
     for (i = 0; i < extra_locals; i++) {
       unsigned linfo = locals_info[parms+i];
-      if (linfo & (1<< LOCAL_REF))
+      if (linfo & (1<< LOCAL_REF) || ((linfo >> LOCAL_INT) & 0x1f) == 0)
 	str_imm(jinfo->codebuf, ARM_R1, Rstack, (extra_locals-1 - i) * 4, 1, 0);
     }
   }
@@ -4671,7 +4701,7 @@ void Thumb2_Enter(Thumb2_Info *jinfo)
     mov_imm(jinfo->codebuf, ARM_R0, 0+CONSTMETHOD_CODEOFFSET);
     bl(jinfo->codebuf, handlers[H_SYNCHRONIZED_ENTER]);
     loc_exception = forward_16(jinfo->codebuf);
-    bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]);
+    bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION_NO_REGS]);
     cbz_patch(jinfo->codebuf, ARM_R0, loc_exception);
     cbz_patch(jinfo->codebuf, ARM_R0, loc_success);
 //    mov_imm(jinfo->codebuf, ARM_R0, 0+CONSTMETHOD_CODEOFFSET);
@@ -4776,6 +4806,8 @@ void Thumb2_codegen(Thumb2_Info *jinfo, 
 
 	if (stackinfo & BC_BRANCH_TARGET) break;
 	if (!(IS_DEAD(stackinfo) || IS_ZOMBIE(stackinfo))) break;
+
+	bc_stackinfo[bci] = (stackinfo & BC_FLAGS_MASK) | (codebuf->idx * 2);
 
 	if (opcode > OPC_LAST_JAVA_OP) {
 	  if (Bytecodes::is_defined((Bytecodes::Code)opcode))
@@ -5824,7 +5856,7 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3, 
 	str_imm(jinfo->codebuf, ARM_R1, Rthread, THREAD_LAST_JAVA_SP, 1, 0);
 	cmp_imm(jinfo->codebuf, ARM_R3, 0);
 	it(jinfo->codebuf, COND_NE, IT_MASK_T);
-	bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]);
+	bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION_NO_REGS]);
 	break;
       }
 
@@ -5941,7 +5973,7 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3, 
 	  str_imm(jinfo->codebuf, ARM_R1, Rthread, THREAD_LAST_JAVA_SP, 1, 0);
 	cmp_imm(jinfo->codebuf, ARM_R3, 0);
 	it(jinfo->codebuf, COND_NE, IT_MASK_T);
-	bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]);
+	bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION_NO_REGS]);
 	  break;
 	} else {
   ldr_imm(jinfo->codebuf, ARM_R2, Ristate, ISTATE_METHOD, 1, 0);
@@ -5980,7 +6012,7 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3, 
 	  str_imm(jinfo->codebuf, ARM_R1, Rthread, THREAD_LAST_JAVA_SP, 1, 0);
 	cmp_imm(jinfo->codebuf, ARM_R3, 0);
 	it(jinfo->codebuf, COND_NE, IT_MASK_T);
-	bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION]);
+	bl(jinfo->codebuf, handlers[H_HANDLE_EXCEPTION_NO_REGS]);
 	}
 	break;
       }
@@ -6447,7 +6479,6 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3, 
       }
 
       default:
-	printf("unknown bytecode = %d\n", opcode);
 	JASSERT(0, "unknown bytecode");
 	break;
     }
@@ -6461,17 +6492,95 @@ add_imm(jinfo->codebuf, ARM_R3, ARM_R3, 
   }
 }
 
-void Thumb2_tablegen(Thumb2_Info *jinfo)
+#define BEG_BCI_OFFSET		0
+#define END_BCI_OFFSET		1
+#define HANDLER_BCI_OFFSET	2
+#define KLASS_INDEX_OFFSET	3
+#define ENTRY_SIZE		4
+
+extern "C" int Thumb2_lr_to_bci(unsigned lr, methodOop method, Reg *regs, unsigned *locals)
+{
+  Compiled_Method *cmethod = compiled_method_list;
+  typeArrayOop table = method->exception_table();
+  constantPoolOop pool = method->constants();
+  int length = table->length();
+
+  while (cmethod) {
+    unsigned *exception_table = cmethod->exception_table;
+    if (exception_table) {
+      unsigned code_base = (unsigned)cmethod;
+      if (code_base <= lr && lr <= (unsigned)exception_table) {
+	int exception_index = -1;
+	unsigned exception_found = 0;
+
+	for (int i = 0; i < length; i += ENTRY_SIZE) {
+	  unsigned offsets = *exception_table++;
+	  unsigned exc_beg = code_base + ((offsets >> 16) << 1);
+	  unsigned exc_end = code_base + ((offsets & 0xffff) << 1);
+
+	  if (exc_beg <= lr && lr <= exc_end) {
+	    if (exc_beg > exception_found) {
+	      // With nested try catch blocks, choose the most deeply nested
+	      exception_found = exc_beg;
+	      exception_index = i;
+	    }	    
+	  }
+	  if (exception_index >= 0) {
+	    if (regs) {
+	      for (unsigned i = 0; i < PREGS; i++) {
+		int local = cmethod->regusage[i];
+		if (local >= 0) {
+		  locals[-local] = regs[i];
+		}
+	      }
+	    }
+	    return table->int_at(exception_index + BEG_BCI_OFFSET);
+	  }
+	}
+      }
+    }
+    cmethod = cmethod->next;
+  }
+  return -1;
+}
+
+void Thumb2_generate_exception_table(Compiled_Method *cmethod, Thumb2_Info *jinfo)
+{
+  methodOop method = jinfo->method;
+  typeArrayOop table = method->exception_table();
+  constantPoolOop pool = method->constants();
+  int length = table->length();
+  unsigned *bc_stackinfo = jinfo->bc_stackinfo;
+
+  cmethod->exception_table = (unsigned *)out_pos(jinfo->codebuf);
+  for (int i = 0; i < length; i += ENTRY_SIZE) {
+    int beg_bci = table->int_at(i + BEG_BCI_OFFSET);
+    int end_bci = table->int_at(i + END_BCI_OFFSET);
+    unsigned stackinfo;
+    unsigned beg_offset, end_offset;
+
+    stackinfo = bc_stackinfo[beg_bci];
+    beg_offset = (stackinfo & ~BC_FLAGS_MASK) >> 1;
+    stackinfo = bc_stackinfo[end_bci];
+    end_offset = (stackinfo & ~BC_FLAGS_MASK) >> 1;
+    if (!(beg_offset != 0 && end_offset >= beg_offset && end_offset < 65536)) {
+	longjmp(compiler_error_env, COMPILER_RESULT_FAILED);
+    }
+    out_32(jinfo->codebuf, (beg_offset << 16) | (end_offset));
+  }
+}
+
+void Thumb2_tablegen(Compiled_Method *cmethod, Thumb2_Info *jinfo)
 {
   unsigned code_size = jinfo->code_size;
   jubyte *code_base = jinfo->code_base;
   unsigned *bc_stackinfo = jinfo->bc_stackinfo;
   unsigned bci;
-  unsigned *count_pos = (unsigned *)out_pos(jinfo->codebuf);
   unsigned count = 0;
   unsigned i;
   CodeBuf *codebuf = jinfo->codebuf;
 
+  cmethod->osr_table = (unsigned *)out_pos(jinfo->codebuf);
   out_32(codebuf, 0);
   bc_stackinfo[0] |= BC_BACK_TARGET;
   for (bci = 0; bci < code_size;) {
@@ -6501,7 +6610,9 @@ void Thumb2_tablegen(Thumb2_Info *jinfo)
       bci += len;
     }
   }
-  *count_pos = count;
+  *cmethod->osr_table = count;
+  if (jinfo->method->has_exception_handler())
+    Thumb2_generate_exception_table(cmethod, jinfo);
 }
 
 extern "C" void Thumb2_Clear_Cache(char *base, char *limit);
@@ -6625,7 +6736,7 @@ extern "C" unsigned cmpxchg_ptr(unsigned
 extern "C" unsigned cmpxchg_ptr(unsigned new_value, volatile unsigned *ptr, unsigned cmp_value);
 static volatile unsigned compiling;
 static unsigned CompileCount = 0;
-static unsigned MaxCompile = 35;
+static unsigned MaxCompile = 130;
 
 #define COMPILE_ONLY	0
 #define COMPILE_COUNT	0
@@ -6705,8 +6816,7 @@ extern "C" unsigned long long Thumb2_Com
   //
   if (code_size > THUMB2_MAX_BYTECODE_SIZE ||
 		(method->max_locals() + method->max_stack()) >= 1000 ||
-		method->has_monitor_bytecodes() ||
-		method->has_exception_handler()) {
+		method->has_monitor_bytecodes()) {
         method->set_not_compilable();
 	return 0;
   }
@@ -6748,8 +6858,11 @@ extern "C" unsigned long long Thumb2_Com
 
 #ifdef T2EE_PRINT_COMPILATION
   if (t2ee_print_compilation) {
-    tty->print("Compiling (%d) ", compiled_methods);
-    tty->print_cr("%s", method->name_and_sig_as_C_string());
+    fprintf(stderr, "Compiling %d %c%c %s\n",
+	compiled_methods,
+	method->is_synchronized() ? 'S' : ' ',
+	method->has_exception_handler() ? 'E' : ' ',
+	method->name_and_sig_as_C_string());
   }
 #endif
 
@@ -6825,6 +6938,9 @@ extern "C" unsigned long long Thumb2_Com
 	Thumb2_disass(&jinfo_str);
 #endif
 
+  for (int i = 0; i < PREGS; i++)


From bugzilla-daemon at icedtea.classpath.org  Tue Feb  2 05:42:36 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 13:42:36 +0000
Subject: [Bug 437] New: YaCy crashed with SIGSEGV
Message-ID: <E1NcJ1Y-0001H2-Bb@icedtea.classpath.org>

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

           Summary: YaCy crashed with SIGSEGV
           Product: IcedTea
           Version: unspecified
          Platform: 64-bit
               URL: http://yacy.net
        OS/Version: Linux
            Status: NEW
          Severity: critical
          Priority: P2
         Component: IcedTea6
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: roland at mxchange.org


I have the Debian amd64 package installed and I have latest version of the
mentioned software.

The JVM crashes while regular but heavy IO operations (it is a search engine
and does do IO operations a lot).

I have uploaded the crash log for ease download:
http://www.mxchange.org/downloads/yacy/hs_err_pid21131.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 bugzilla-daemon at icedtea.classpath.org  Tue Feb  2 05:43:15 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 13:43:15 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJ2B-0001H9-OY@icedtea.classpath.org>

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





------- Comment #1 from roland at mxchange.org  2010-02-02 13:43 -------
Created an attachment (id=292)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=292&action=view)
crash-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 bugzilla-daemon at icedtea.classpath.org  Tue Feb  2 05:48:24 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 13:48:24 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJ7A-0001HY-3r@icedtea.classpath.org>

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





------- Comment #2 from roland at mxchange.org  2010-02-02 13:48 -------
Created an attachment (id=293)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=293&action=view)
Yet-another crash


-- 
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 ptisnovs at icedtea.classpath.org  Tue Feb  2 05:51:03 2010
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 13:51:03 +0000
Subject: /hg/icedtea6: 6912628: test/java/util/jar/JarFile/TurkCert.java ...
Message-ID: <hg.cc7232b07731.1265118663.2873452341184383832@icedtea.classpath.org>

changeset cc7232b07731 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cc7232b07731
author: ptisnovs
date: Tue Feb 02 14:50:43 2010 +0100

	6912628: test/java/util/jar/JarFile/TurkCert.java cannot be run in
	samevm mode Summary: Added tag to run this test in othervm Reviewed-
	by: chega


diffstat:

3 files changed, 24 insertions(+), 1 deletion(-)
ChangeLog                              |    8 ++++++++
Makefile.am                            |    3 ++-
patches/icedtea-6912628-turkcert.patch |   14 ++++++++++++++

diffs (46 lines):

diff -r ba5d4644582d -r cc7232b07731 ChangeLog
--- a/ChangeLog	Tue Feb 02 11:08:36 2010 +0000
+++ b/ChangeLog	Tue Feb 02 14:50:43 2010 +0100
@@ -1,3 +1,11 @@ 2010-02-02  Edward Nevill <ed at camswl.com
+2010-02-02 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patches.
+	* patches/icedtea-6912628-turkcert.patch:
+	Fix for Sun bug: 6912628: test case correction
+	test/java/util/jar/JarFile/TurkCert.java cannot be run in
+	samevm mode. Added tag to run this test in othervm
+
 2010-02-02  Edward Nevill <ed at camswl.com>
 
 	* asm_helper.cpp, cppInterpreter_arm.S, thumb2.cpp, bytecodes_arm.def
diff -r ba5d4644582d -r cc7232b07731 Makefile.am
--- a/Makefile.am	Tue Feb 02 11:08:36 2010 +0000
+++ b/Makefile.am	Tue Feb 02 14:50:43 2010 +0100
@@ -312,7 +312,8 @@ ICEDTEA_PATCHES = \
 	patches/libpng.patch \
 	patches/icedtea-6920143-using-with-mouse.patch \
         patches/icedtea-6920172-location-relative-to-test.patch \
-        patches/icedtea-6920172-turkish.patch
+        patches/icedtea-6920172-turkish.patch \
+        patches/icedtea-6912628-turkcert.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r ba5d4644582d -r cc7232b07731 patches/icedtea-6912628-turkcert.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6912628-turkcert.patch	Tue Feb 02 14:50:43 2010 +0100
@@ -0,0 +1,14 @@
+6912628: test/java/util/jar/JarFile/TurkCert.java cannot be run in samevm mode
+Summary: Added tag to run this test in othervm
+Reviewed-by: chegar
+
+--- openjdk.orig/jdk/test/java/util/jar/JarFile/TurkCert.java	2010-02-02 12:02:47.216585000 +0100
++++ openjdk/jdk/test/java/util/jar/JarFile/TurkCert.java	2010-02-02 12:02:46.933586000 +0100
+@@ -26,6 +26,7 @@
+  * @bug 4624534
+  * @summary Make sure jar certificates work for Turkish locale
+  * @author kladko
++ * @run main/othervm TurkCert
+  */
+ 
+ import java.util.*;


From bugzilla-daemon at icedtea.classpath.org  Tue Feb  2 06:03:00 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 14:03:00 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJLI-0001Hv-7l@icedtea.classpath.org>

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


roland at mxchange.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Version|unspecified                 |6-1.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  Tue Feb  2 06:29:11 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 14:29:11 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJkd-0001Im-Gw@icedtea.classpath.org>

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





------- Comment #3 from xerxes at zafena.se  2010-02-02 14:29 -------
>From the crash log it looks like there might be some issues with the garbage
collector. This bug might be related to the hotspot garbage colletor bugs
discussed at: http://old.nabble.com/Crash-Hotspot-td27306522.html

to summarize that discussion "there are a lot of bugs in the new garbage
collector implementations, the only one without bugs are the old serial GC
-XX:+UseSerialGC ).

Possible that the garbage collector have run out of heap.

Heap
 par new generation   total 38336K, used 34356K [0x00007f12a4910000,
0x00007f12a72a0000, 0x00007f12a72a0000)
  eden space 34112K,  88% used [0x00007f12a4910000, 0x00007f12a667d050,
0x00007f12a6a60000)
  from space 4224K, 100% used [0x00007f12a6a60000, 0x00007f12a6e80000,
0x00007f12a6e80000)     <----- !!!
  to   space 4224K,   0% used [0x00007f12a6e80000, 0x00007f12a6e80000,
0x00007f12a72a0000)
 concurrent mark-sweep generation total 4151744K, used 3352309K
[0x00007f12a72a0000, 0x00007f13a4910000, 0x00007f13a4910000)
 concurrent-mark-sweep perm gen total 45552K, used 27464K [0x00007f13a4910000,
0x00007f13a758c000, 0x00007f13a7710000)

The JVM are run with 
jvm_args: -Xms4096m -Xmx4096m -XX:+UseParNewGC -XX:+UseConcMarkSweepGC
-XX:ParallelGCThreads=2 -XX:MaxPermSize=45m -XX:ReservedCodeCacheSize=25m
-Djava.awt.headless=true 


Could you try run the jvm with the default garbage collector:
jvm_args: -Xms4096m -Xmx4096m -XX:ParallelGCThreads=2 -XX:MaxPermSize=45m
-XX:ReservedCodeCacheSize=25m -Djava.awt.headless=true 

ortry  explicitly set it to use an older implementation of garbage collector
like the SerialGC
jvm_args: -Xms4096m -Xmx4096m -XX:+UseSerialGC -XX:ParallelGCThreads=2
-XX:MaxPermSize=45m -XX:ReservedCodeCacheSize=25m -Djava.awt.headless=true 


-- 
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 Feb  2 06:32:52 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 14:32:52 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJoC-0001Iv-S2@icedtea.classpath.org>

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





------- Comment #4 from roland at mxchange.org  2010-02-02 14:32 -------
I have looked a bit through the code. I found some finalize() overrides which
doesn't call the super.finalize() method. Maybe that can also be related? I'm
just curious about this, normally, you should call final mehtods in Object
class when you override them, for what purpose ever.

Okay, once the JVM crashes, I will try both options out. Please be patient, it
does crash randomly.


-- 
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 Feb  2 06:39:34 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 14:39:34 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJug-0001JO-4J@icedtea.classpath.org>

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





------- Comment #5 from roland at mxchange.org  2010-02-02 14:39 -------
Oh, I recall that I should better report this to the package maintainer (Debian
bug tracker), hope you don't mind. :) :) :)


-- 
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 Feb  2 06:40:46 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 14:40:46 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcJvq-0001JT-Lc@icedtea.classpath.org>

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





------- Comment #6 from roland at mxchange.org  2010-02-02 14:40 -------
Damn typo in comment #4. Hope you see it... ;) "final method"...


-- 
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 Feb  2 07:10:47 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 15:10:47 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcKOt-0001Ka-5U@icedtea.classpath.org>

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





------- Comment #7 from roland at mxchange.org  2010-02-02 15:10 -------
Crashed again, so it is reproduceable but still random. I try now these out:

jvm_args: -Xms4096m -Xmx4096m -XX:ParallelGCThreads=2 -XX:MaxPermSize=45m
-XX:ReservedCodeCacheSize=25m -Djava.awt.headless=true

Do you need that crash log from this recent crash?


-- 
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 Feb  2 07:27:19 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 15:27:19 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcKet-0001LC-Qf@icedtea.classpath.org>

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





------- Comment #8 from xerxes at zafena.se  2010-02-02 15:27 -------
(In reply to comment #7)
> Crashed again, so it is reproduceable but still random. I try now these out:
> 
> jvm_args: -Xms4096m -Xmx4096m -XX:ParallelGCThreads=2 -XX:MaxPermSize=45m
> -XX:ReservedCodeCacheSize=25m -Djava.awt.headless=true
> 
> Do you need that crash log from this recent crash?
> 

Please do: (mark the crash logs with the java garbage collector options used)

And please post some short instructions how to reproduce this bug:
like download this or that deb package or some tarball
run this command with these options...
click these checkboxes etc..
and then make coffee while waiting for the crash.


-- 
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 Feb  2 08:17:14 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 16:17:14 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcLRC-0001NG-7E@icedtea.classpath.org>

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





------- Comment #9 from roland at mxchange.org  2010-02-02 16:17 -------
Okay, here might be some steps to reproduce, I assume, the JDK including JRE is
installed and works:
- Go to http://www.yacystats.de/yacybuild/ which holds recent development
version
- Launch a terminal like xterm
- Unpack it e.g. in your $HOME directory and keep directory structure intact,
this will always create a directory called "yacy".
- Do a "cd yacy"
- Edit the script startYACY.sh by adding the command-line arguments from
comment #3
- Do a "./startYACY.sh
- After a short startup it will bring up your default browser if you launch it
from that terminal
- If not, wait a bit and call http://localhost:8080 in your favorite browser,
you should have JavaScript enabled, cookies are not needed
- Shutdown the node again (also by invoking stopYACY.sh
- Remove the settings file at DATA/SETTINGS/yacy.conf
- Download my settings (I excluded security-related settings like password and
user names):
wget htpp://www.mxchange.org/downloads/yacy/yacy.conf.my -O
DATA/SETTINGS/yacy.conf
- And invoke ./startYACY.sh
- Go to "Admin Console" and then "Basic setup"
- Enter some better host name, e.g. "openjdk-tester-xxxx" (buy xxxx is a random
number), it is not required but gives the other node users some feedback what
node you are
- Make sure the port is reachable from outside, which is recommended and needed
for incoming remote-crawls which are enbaled by my configuration
- Now click on "Index Creation" and add some URLs, e.g. cnn.com classpath.org,
sun.com and such, but enable these settings: (I use them)
--> Re-crawl known URLs (keep 3 months, which is the default)
--> Accept URLs with '?' / dynamic URLs
--> Do Local Indexing: text/media (all checked)
--> Do Remote Indexing: Enter some comment why you start it
- Now head for "Crawl monitor" and watch it crawling or:
- ... its maybe time to bring out your dog or wash dishes, talk with your wife,
what ever you prefer. :)


-- 
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 Feb  2 08:45:08 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 16:45:08 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcLsC-0001OQ-1g@icedtea.classpath.org>

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





------- Comment #10 from roland at mxchange.org  2010-02-02 16:45 -------
(From update of attachment 292)
buggy GC options


-- 
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 Feb  2 08:45:10 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 16:45:10 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcLsE-0001OU-7q@icedtea.classpath.org>

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





------- Comment #11 from roland at mxchange.org  2010-02-02 16:45 -------
(From update of attachment 293)
buggy GC options


-- 
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 Feb  2 10:32:43 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 18:32:43 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcNYJ-0001cO-NP@icedtea.classpath.org>

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





------- Comment #12 from roland at mxchange.org  2010-02-02 18:32 -------
Hmmm, I didn't get any crash, but the memory was getting low:
http://forum.yacy-websuche.de/viewtopic.php?f=5&t=2669

I reported heavy IO load on the hard drive and that some unix processes cannot
be launched. Please look at the last graphic, it shows that 3200 MB are used,
but I gave 4096.

This behavior does happen with these GC settings:
-XX:ParallelGCThreads=2 -XX:MaxPermSize=45m -XX:ReservedCodeCacheSize=25m
-Djava.awt.headless=true

But with my origin, I have some times crashes but not that behavoir. Strange...


-- 
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 Feb  2 11:10:07 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 19:10:07 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcO8V-0001kU-F7@icedtea.classpath.org>

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





------- Comment #13 from roland at mxchange.org  2010-02-02 19:10 -------
These settings does also have the same behavior:
-XX:+UseSerialGC -XX:ParallelGCThreads=2 -XX:MaxPermSize=45m
-XX:ReservedCodeCacheSize=25m -Djava.awt.headless=true

After some time, strong hard drive activity but the application itself is quiet
(no crawler active, DHT disabled). And when I try to restart:
----------------------------------------------------------------------------------
E 2010/02/02 20:08:34 RESTART restart failed
java.io.IOException: Cannot run program "chmod": java.io.IOException: error=12,
Cannot allocate memory
        at java.lang.ProcessBuilder.start(ProcessBuilder.java:474)
        at java.lang.Runtime.exec(Runtime.java:610)
        at java.lang.Runtime.exec(Runtime.java:448)
        at java.lang.Runtime.exec(Runtime.java:345)
        at net.yacy.kelondro.util.OS.deployScript(OS.java:364)
        at de.anomic.yacy.yacyRelease.restart(yacyRelease.java:465)
        at Steering.respond(Steering.java:70)
        at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
        at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
        at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.lang.reflect.Method.invoke(Method.java:616)
        at
de.anomic.http.server.HTTPDFileHandler.invokeServlet(HTTPDFileHandler.java:1195)
        at
de.anomic.http.server.HTTPDFileHandler.doResponse(HTTPDFileHandler.java:752)
        at
de.anomic.http.server.HTTPDFileHandler.doGet(HTTPDFileHandler.java:234)
        at de.anomic.http.server.HTTPDemon.GET(HTTPDemon.java:493)
        at sun.reflect.GeneratedMethodAccessor11.invoke(Unknown Source)
        at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
        at java.lang.reflect.Method.invoke(Method.java:616)
        at de.anomic.server.serverCore$Session.listen(serverCore.java:735)
        at de.anomic.server.serverCore$Session.run(serverCore.java:629)
Caused by: java.io.IOException: java.io.IOException: error=12, Cannot allocate
memory
        at java.lang.UNIXProcess.<init>(UNIXProcess.java:164)
        at java.lang.ProcessImpl.start(ProcessImpl.java:81)
        at java.lang.ProcessBuilder.start(ProcessBuilder.java:467)
        ... 19 more
----------------------------------------------------------------------------------
And no response to the restart. I need to "killall -KILL java". :(


-- 
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 Feb  2 12:15:29 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 20:15:29 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcP9l-0001nC-Sg@icedtea.classpath.org>

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





------- Comment #14 from xerxes at zafena.se  2010-02-02 20:15 -------
what you experience in comment #12 and #13 sounds like normal out of memory
issues when a java application allocates all available RAM (and swap) on a
system.

You have to check with the yacy community to see if yacy can be configured to
not use more ram than you actually got installed in your system. You might
solve your memory issues by simply specifying a lower -Xms and -Xmx value when
starting the jvm, for example if you got 2Gb of physical ram installed then
dont specify more than -Xms2048m -Xmx2048m or else you will start running on
swapspace in no time (slow noisy and makes your system unresponsible and when
it runs out then you start see the cant run program errors) .

ok back to the real bug (the SIGSEGV jvm crash) ... im happy to see that you do
not get any hotspot jvm crashes when running using the default garbage
collector options and serial gc option, this probably means that there are
something broken with the -XX:+UseParNewGC -XX:+UseConcMarkSweepGC but we
really dont know unless we have it reproducable running under a debugger. 

please file a new bug if you experience other kinds of bugs than the SIGSEGV
jvm crash.


-- 
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 Feb  2 12:20:39 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 20:20:39 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NcPEl-0001nU-Nk@icedtea.classpath.org>

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





------- Comment #15 from roland at mxchange.org  2010-02-02 20:20 -------
Okay, I have NetBeans here and I'm certified as SCJP and SCWCD, so I can give
it a try by myself. I report back - may take long - once I have reproduced the
bug. If you have ICQ/Jabber, please contact me by email and I'll add you so we
can later on fix this in chat session. This email session is really sloopy. ;-)


-- 
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 icedtea.classpath.org  Tue Feb  2 13:21:33 2010
From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org)
Date: Tue, 02 Feb 2010 21:21:33 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.a2659c8bb3c4.1265145693.2873452341184383832@icedtea.classpath.org>

changeset a2659c8bb3c4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a2659c8bb3c4
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Feb 02 16:16:48 2010 -0500

	- Re-designed frame embedding code so that the applet is dynamically
	packed into given handle. This increases stability and breaks
	reliance on the assumption that the browser will always provide a
	handle in a certain sequence.


changeset f8d8f6b0a1fd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f8d8f6b0a1fd
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Feb 02 16:21:26 2010 -0500

	Added tests for JSObject.eval()


diffstat:

6 files changed, 1263 insertions(+), 1138 deletions(-)
ChangeLog                                                |   14 
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 2314 +++++++-------
plugin/tests/LiveConnect/PluginTest.java                 |   11 
plugin/tests/LiveConnect/common.js                       |    3 
plugin/tests/LiveConnect/index.html                      |    2 
plugin/tests/LiveConnect/jjs_eval_test.js                |   57 

diffs (truncated from 2841 to 500 lines):

diff -r cc7232b07731 -r f8d8f6b0a1fd ChangeLog
--- a/ChangeLog	Tue Feb 02 14:50:43 2010 +0100
+++ b/ChangeLog	Tue Feb 02 16:21:26 2010 -0500
@@ -1,3 +1,17 @@ 2010-02-02 Pavel Tisnovsky <ptisnovs at red
+2010-02-02  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/tests/LiveConnect/PluginTest.java
+	(jjsEvalTest): New function. Calls JSObject.eval() with given string.
+	* plugin/tests/LiveConnect/common.js: Added eval test suite as one of the
+	run options.
+	* plugin/tests/LiveConnect/index.html: Same.
+	* plugin/tests/LiveConnect/jjs_eval_test.js: Eval tests.
+
+2010-02-02  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Re-designed frame
+	embedding code so that the applet is dynamically packed into given handle.
+
 2010-02-02 Pavel Tisnovsky <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patches.
diff -r cc7232b07731 -r f8d8f6b0a1fd plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Tue Feb 02 14:50:43 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Tue Feb 02 16:21:26 2010 -0500
@@ -91,6 +91,7 @@ import java.net.URI;
 import java.net.URI;
 import java.net.URL;
 import java.security.AccessController;
+import java.security.AllPermission;
 import java.security.PrivilegedAction;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -114,598 +115,170 @@ import com.sun.jndi.toolkit.url.UrlUtil;
   * Lets us construct one using unix-style one shot behaviors
   */
  
- class PluginAppletViewerFactory
+ class PluginAppletPanelFactory
  {
-     public PluginAppletViewer createAppletViewer(int identifier,
-                                                  long handle, int x, int y,
- 						 URL doc, Hashtable atts) {
-         PluginAppletViewer pluginappletviewer = new PluginAppletViewer(identifier, handle, x, y, doc, atts, System.out, this);
-         return pluginappletviewer;
+
+     public AppletPanel createPanel(PluginStreamHandler streamhandler, 
+                                    int identifier,
+                                    long handle, int x, int y,
+                                    final URL doc, final Hashtable atts) {
+
+         AppletViewerPanel panel = (AppletViewerPanel) AccessController.doPrivileged(new PrivilegedAction() {
+             public Object run() {
+                    try {
+                        AppletPanel panel = new NetxPanel(doc, atts, false);
+                        AppletViewerPanel.debug("Using NetX panel");
+                        PluginDebug.debug(atts.toString());
+                        return panel;
+                    } catch (Exception ex) {
+                        AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
+                        return new AppletViewerPanel(doc, atts);
+                    }
+             }
+         });
+
+         double heightFactor = 1.0;
+         double widthFactor = 1.0;
+
+         if (atts.get("heightPercentage") != null) {
+             heightFactor = (Integer) atts.get("heightPercentage")/100.0;
+         }
+         
+         if (atts.get("widthPercentage") != null) {
+             widthFactor = (Integer) atts.get("widthPercentage")/100.0;
+         }
+         
+
+         // put inside initial 0 handle frame
+         PluginAppletViewer.reFrame(null, identifier, System.out, 
+                 heightFactor, widthFactor, 0, panel);
+         
+         panel.init();
+
+         // Start the applet
+         initEventQueue(panel);
+
+         // Applet initialized. Find out it's classloader and add it to the list
+         String portComponent = doc.getPort() != -1 ? ":" + doc.getPort() : "";
+         String codeBase = doc.getProtocol() + "://" + doc.getHost() + portComponent;
+
+         if (atts.get("codebase") != null) {
+             try {
+                 URL appletSrcURL = new URL(codeBase + (String) atts.get("codebase"));
+                 codeBase = appletSrcURL.getProtocol() + "://" + appletSrcURL.getHost();
+             } catch (MalformedURLException mfue) {
+                 // do nothing
+             }
+         }
+
+
+         // Wait for the panel to initialize
+         // (happens in a separate thread)
+         Applet a;
+         
+         // Wait for panel to come alive
+         int maxWait = 5000; // wait 5 seconds max for panel to come alive
+         int wait = 0;
+         while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
+              try {
+                  Thread.sleep(50);
+                  wait += 50;
+              } catch (InterruptedException ie) {
+                  ie.printStackTrace();
+              }
+         }
+         
+         // Wait for the panel to initialize
+         // (happens in a separate thread)
+         while (panel.getApplet() == null &&
+                ((NetxPanel) panel).isAlive()) {
+             try {
+                 Thread.sleep(50);
+                 PluginDebug.debug("Waiting for applet to initialize...");
+             } catch (InterruptedException ie) {
+                 ie.printStackTrace();
+             }
+         }
+
+         a = panel.getApplet();
+
+         // Still null?
+         if (panel.getApplet() == null) {
+             streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
+             return null;
+         }
+
+         PluginDebug.debug("Applet " + a.getClass() + " initialized");
+         streamhandler.write("instance " + identifier + " initialized");
+         
+         AppletSecurityContextManager.getSecurityContext(0).associateSrc(((NetxPanel) panel).getAppletClassLoader(), doc);
+         AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, ((NetxPanel) panel).getAppletClassLoader());
+         
+         return panel;
      }
  
      public boolean isStandalone()
      {
          return false;
      }
- }
- 
- class PluginParseRequest
- {
-     long handle;
-     String tag;
-     String documentbase;
- }
- 
- /*
-  */
- // FIXME: declare JSProxy implementation
- public class PluginAppletViewer extends XEmbeddedFrame
-     implements AppletContext, Printable {
-     /**
-      * Some constants...
-      */
-     private static String defaultSaveFile = "Applet.ser";
-     
-     private static enum PAV_INIT_STATUS {PRE_INIT, ACTIVE, INACTIVE};
-
-     /**
-      * The panel in which the applet is being displayed.
-      */
-     AppletViewerPanel panel;
- 
-     /**
-      * The status line.
-      */
-     Label label;
- 
-     /**
-      * output status messages to this stream
-      */
- 
-     PrintStream statusMsgStream;
- 
-     /**
-      * For cloning
-      */
-     PluginAppletViewerFactory factory;
- 
-     int identifier;
- 
-     private static HashMap<Integer, PluginParseRequest> requests = 
-         new HashMap();
- 
-     // Instance identifier -> PluginAppletViewer object.
-     private static HashMap<Integer, PluginAppletViewer> applets = 
-         new HashMap();
-     
-     private static PluginStreamHandler streamhandler;
-     
-     private static PluginCallRequestFactory requestFactory;
-
-     private static HashMap<Integer, PAV_INIT_STATUS> status = 
-         new HashMap<Integer,PAV_INIT_STATUS>();
-
-     private double proposedHeightFactor;
-     private double proposedWidthFactor;
-
-     /**
-      * Null constructor to allow instantiation via newInstance()
-      */
-     public PluginAppletViewer() {
-     }
-     
-     /**
-      * Create the applet viewer
-      */
-     public PluginAppletViewer(final int identifier, long handle, int x, int y, final URL doc,
-                               final Hashtable atts, PrintStream statusMsgStream,
-                               PluginAppletViewerFactory factory) {
-         super(handle, true);
-    	this.factory = factory;
- 	this.statusMsgStream = statusMsgStream;
-         this.identifier = identifier;
-         // FIXME: when/where do we remove this?
-         PluginDebug.debug ("PARSING: PUTTING " + identifier + " " + this);
-         applets.put(identifier, this);
-         
-         
-         // we intercept height and width specifications here because 
-         proposedHeightFactor = 1.0;
-         proposedWidthFactor = 1.0;
-
-         if (atts.get("heightPercentage") != null) {
-        	 proposedHeightFactor = (Integer) atts.get("heightPercentage")/100.0;
-         }
-         
-         if (atts.get("widthPercentage") != null) {
-        	 proposedWidthFactor = (Integer) atts.get("widthPercentage")/100.0;
-         }
- 
-         AccessController.doPrivileged(new PrivilegedAction() {
-             public Object run() {
-            	 	try {
-            	 		panel = new NetxPanel(doc, atts, false);
-            	 		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);
-            	 	}
-                 return null;
-             }
-         });  
-
- 	add("Center", panel);
- 	panel.init();
- 	appletPanels.addElement(panel);
- 
- 	pack();
- 	
- 	// 0 handle implies 0x0 plugin, don't show it else it creates an entry in the window list
- 	if (handle != 0) 
- 	    setVisible(true);
- 
- 	WindowListener windowEventListener = new WindowAdapter() {
- 
- 	    public void windowClosing(WindowEvent evt) {
- 		appletClose();
- 	    }
- 
- 	    public void windowIconified(WindowEvent evt) {
- 		appletStop();
- 	    }
- 
- 	    public void windowDeiconified(WindowEvent evt) {
- 		appletStart();
- 	    }
- 	};
- 
- 	class AppletEventListener implements AppletListener  
- 	{
- 	    final Frame frame;
- 
- 	    public AppletEventListener(Frame frame)
- 	    {
- 		this.frame = frame;
- 	    }
- 
- 	    public void appletStateChanged(AppletEvent evt) 
- 	    {
- 		AppletPanel src = (AppletPanel)evt.getSource();
- 
- 		switch (evt.getID()) {
-                     case AppletPanel.APPLET_RESIZE: {
- 			if(src != null) {
- 			    resize(preferredSize());
- 			    validate();
-                         }
- 			break;
- 		    }
- 		    case AppletPanel.APPLET_LOADING_COMPLETED: {
- 			Applet a = src.getApplet(); // sun.applet.AppletPanel
- 			
- 			// Fixed #4754451: Applet can have methods running on main
- 			// thread event queue. 
- 			// 
- 			// The cause of this bug is that the frame of the applet 
- 			// is created in main thread group. Thus, when certain 
- 			// AWT/Swing events are generated, the events will be
- 			// dispatched through the wrong event dispatch thread.
- 			//
- 			// To fix this, we rearrange the AppContext with the frame,
- 			// so the proper event queue will be looked up.
- 			//
- 			// Swing also maintains a Frame list for the AppContext,
- 			// so we will have to rearrange it as well.
- 			//
- 			if (a != null)
- 			    AppletPanel.changeFrameAppContext(frame, SunToolkit.targetToAppContext(a));
- 			else
- 			    AppletPanel.changeFrameAppContext(frame, AppContext.getAppContext());
- 
- 			break;
- 		    }
- 		}
- 	    }
- 	};
- 
- 	addWindowListener(windowEventListener);
- 	panel.addAppletListener(new AppletEventListener(this));
- 
- 	// Start the applet
-    showStatus(amh.getMessage("status.start"));
- 	initEventQueue();
- 	
- 	// Wait for the panel to initialize
-    // (happens in a separate thread)
- 	Applet a;
- 	
- 	// Wait for panel to come alive
- 	int maxWait = 5000; // wait 5 seconds max for panel to come alive
- 	int wait = 0;
- 	while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
-         try {
-             Thread.sleep(50);
-             wait += 50;
-         } catch (InterruptedException ie) {
-             ie.printStackTrace();
-         }
-    }
- 	
-    // Wait for the panel to initialize
-    // (happens in a separate thread)
-    while (panel.getApplet() == null &&
-           ((NetxPanel) panel).isAlive()) {
-        try {
-            Thread.sleep(50);
-            PluginDebug.debug("Waiting for applet to initialize...");
-        } catch (InterruptedException ie) {
-            ie.printStackTrace();
-        }
-    }
- 	
-    a = panel.getApplet();
-
-    // Still null?
-    if (panel.getApplet() == null) {
-    	this.streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
-    	return;
-    }
-
-    PluginDebug.debug("Applet " + a.getClass() + " initialized");
-
-    // Applet initialized. Find out it's classloader and add it to the list
-    String portComponent = doc.getPort() != -1 ? ":" + doc.getPort() : "";
-    String codeBase = doc.getProtocol() + "://" + doc.getHost() + portComponent;
-
-    if (atts.get("codebase") != null) {
-    	try {
-    		URL appletSrcURL = new URL(codeBase + (String) atts.get("codebase"));
-    		codeBase = appletSrcURL.getProtocol() + "://" + appletSrcURL.getHost();
-    	} catch (MalformedURLException mfue) {
-    		// do nothing
-    	}
-    }
-
-    AppletSecurityContextManager.getSecurityContext(0).associateSrc(((NetxPanel) panel).getAppletClassLoader(), doc);
-    AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, ((NetxPanel) panel).getAppletClassLoader());
-    
- 	try {
- 	    write("initialized");
- 	} catch (IOException ioe) {
- 		ioe.printStackTrace();
- 	}
- 	
-     }
-
- 	public static void setStreamhandler(PluginStreamHandler sh) {
-		streamhandler = sh;
-	}
-
- 	public static void setPluginCallRequestFactory(PluginCallRequestFactory rf) {
-		requestFactory = rf;
-	}
-
-     /**
-      * Handle an incoming message from the plugin.
-      */
-     public static void handleMessage(int identifier, int reference, String message)
-     {
-
-		 PluginDebug.debug("PAV handling: " + message);
-		 
-         try {
-        	 if (message.startsWith("tag")) {
-        		 
-        		 // tag and handle must both be set before parsing, so we need
-        		 // synchronization here, as the setting of these variables
-        		 // may happen in independent threads
-        		 
-        		 synchronized(requests) {
-
-                     // Check if we should proceed with init 
-                     // (=> no if destroy was called after tag, but before 
-                     // handle)
-                     if (status.containsKey(identifier) &&
-                         status.get(identifier).equals(PAV_INIT_STATUS.INACTIVE)) {
-
-                         PluginDebug.debug("Inactive flag set. Refusing to initialize instance " + identifier);
-                         requests.remove(identifier);
-                         return;
-
-                     }
-
-        		     status.put(identifier, PAV_INIT_STATUS.PRE_INIT);
-        		     
-        			 PluginParseRequest request = requests.get(identifier);
-        			 if (request == null) {
-        				 request = new PluginParseRequest();
-        				 requests.put(identifier, request);
-        			 }
-        			 int index = message.indexOf(' ', "tag".length() + 1);
-        			 request.documentbase =
-        				 UrlUtil.decode(message.substring("tag".length() + 1, index));
-        			 request.tag = message.substring(index + 1);
-        			 PluginDebug.debug ("REQUEST TAG: " + request.tag + " " +
-        					 Thread.currentThread());
-
-        			 if (request.handle != 0) {
-        				 PluginDebug.debug ("REQUEST TAG, PARSING " +
-        						 Thread.currentThread());
-        				 PluginAppletViewer.parse
-        				 (identifier, request.handle,
-        						 new StringReader(request.tag),
-        						 new URL(request.documentbase));
-        				 requests.remove(identifier);
-
-        				 // Panel initialization cannot be aborted mid-way. 
-        				 // Once it is initialized, double check to see if this 
-        				 // panel needs to stay around..
-        				 if (status.get(identifier).equals(PAV_INIT_STATUS.INACTIVE)) {
-        				     PluginDebug.debug("Inactive flag set. Destroying applet instance " + identifier);
-        				     applets.get(identifier).handleMessage(-1, "destroy");
-        				 } else {
-        				     status.put(identifier, PAV_INIT_STATUS.ACTIVE);
-        				 }
-
-        			 } else {
-        				 PluginDebug.debug ("REQUEST HANDLE NOT SET: " + request.handle + ". BYPASSING");
-        			 }
-        		 }
-        		 
-             } else if (message.startsWith("handle")) {
-            	 synchronized(requests) {
-            	     
-            	     // Check if we should proceed with init 
-            	     // (=> no if destroy was called after handle, but before 
-            	     // tag)
-            	     if (status.containsKey(identifier) &&
-                         status.get(identifier).equals(PAV_INIT_STATUS.INACTIVE)) {
-
-            	         PluginDebug.debug("Inactive flag set. Refusing to initialize instance " + identifier);
-            	         requests.remove(identifier);
-            	         return;
-
-            	     }
-
-            	     status.put(identifier, PAV_INIT_STATUS.PRE_INIT);
-
-            		 PluginParseRequest request = requests.get(identifier);
-            		 if (request == null) {
-            			 request = new PluginParseRequest();
-            			 requests.put(identifier, request);
-            		 }
-            		 request.handle = Long.parseLong
-            		 (message.substring("handle".length() + 1));
-            		 PluginDebug.debug ("REQUEST HANDLE: " + request.handle);
-            		 if (request.tag != null) {


From ptisnovs at icedtea.classpath.org  Wed Feb  3 04:31:22 2010
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 03 Feb 2010 12:31:22 +0000
Subject: /hg/icedtea6: Fix for Sun bug: 6829636: test case correction
Message-ID: <hg.55c898e59858.1265200281.2873452341184383832@icedtea.classpath.org>

changeset 55c898e59858 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=55c898e59858
author: ptisnovs
date: Wed Feb 03 13:30:49 2010 +0100

	Fix for Sun bug: 6829636: test case correction
	test/java/util/logging/loggingdeadlock2.java


diffstat:

3 files changed, 258 insertions(+), 1 deletion(-)
ChangeLog                                      |    7 
Makefile.am                                    |    3 
patches/icedtea-6829636-loggingdeadlock2.patch |  249 ++++++++++++++++++++++++

diffs (280 lines):

diff -r f8d8f6b0a1fd -r 55c898e59858 ChangeLog
--- a/ChangeLog	Tue Feb 02 16:21:26 2010 -0500
+++ b/ChangeLog	Wed Feb 03 13:30:49 2010 +0100
@@ -1,3 +1,10 @@ 2010-02-02  Deepak Bhole <dbhole at redhat.
+2010-02-03 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/icedtea-6829636-loggingdeadlock2.patch
+	Fix for Sun bug: 6829636: test case correction
+	test/java/util/logging/loggingdeadlock2.java
+
 2010-02-02  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/tests/LiveConnect/PluginTest.java
diff -r f8d8f6b0a1fd -r 55c898e59858 Makefile.am
--- a/Makefile.am	Tue Feb 02 16:21:26 2010 -0500
+++ b/Makefile.am	Wed Feb 03 13:30:49 2010 +0100
@@ -313,7 +313,8 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-6920143-using-with-mouse.patch \
         patches/icedtea-6920172-location-relative-to-test.patch \
         patches/icedtea-6920172-turkish.patch \
-        patches/icedtea-6912628-turkcert.patch
+        patches/icedtea-6912628-turkcert.patch \
+        patches/icedtea-6829636-loggingdeadlock2.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r f8d8f6b0a1fd -r 55c898e59858 patches/icedtea-6829636-loggingdeadlock2.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-6829636-loggingdeadlock2.patch	Wed Feb 03 13:30:49 2010 +0100
@@ -0,0 +1,249 @@
+6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
+Fixes created by mchung and martin
+
+--- openjdk.orig/jdk/test/java/util/logging/LoggingDeadlock2.java	Fri Jan 30 16:27:33 2009 -0800
++++ openjdk/jdk/test/java/util/logging/LoggingDeadlock2.java	Fri Dec 04 23:11:11 2009 +0000
+@@ -23,10 +23,10 @@
+ 
+ /*
+  * @test
+- * @bug     6467152
++ * @bug     6467152 6716076 6829503
+  *
+  * @summary deadlock occurs in LogManager initialization and JVM termination
+- * @author  Serguei Spitsyn / Hittachi
++ * @author  Serguei Spitsyn / Hittachi / Martin Buchholz
+  *
+  * @build    LoggingDeadlock2
+  * @run  main/timeout=15 LoggingDeadlock2
+@@ -47,43 +47,195 @@
+  * This is a regression test for this bug.
+  */
+ 
++import java.util.Arrays;
++import java.util.List;
++import java.util.Random;
++import java.util.concurrent.CyclicBarrier;
++import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.logging.LogManager;
+-
+-public class LoggingDeadlock2 implements Runnable {
+-    static final java.io.PrintStream out = System.out;
+-    static Object lock = new Object();
+-    static int c = 0;
+-    public static void main(String arg[]) {
+-        out.println("\nThis test checks that there is no deadlock.");
+-        out.println("If not crashed or timed-out then it is passed.");
++import java.io.File;
++import java.io.InputStream;
++import java.io.InputStreamReader;
++import java.io.Reader;
++
++public class LoggingDeadlock2 {
++
++    public static void realMain(String arg[]) throws Throwable {
+         try {
+-            new Thread(new LoggingDeadlock2()).start();
+-            synchronized(lock) {
+-                c++;
+-                if (c == 2) lock.notify();
+-                else lock.wait();
++            System.out.println(javaChildArgs);
++            ProcessBuilder pb = new ProcessBuilder(javaChildArgs);
++            ProcessResults r = run(pb.start());
++            equal(r.exitValue(), 99);
++            equal(r.out(), "");
++            equal(r.err(), "");
++        } catch (Throwable t) { unexpected(t); }
++    }
++
++    public static class JavaChild {
++        public static void main(String args[]) throws Throwable {
++            final CyclicBarrier startingGate = new CyclicBarrier(2);
++            final Throwable[] thrown = new Throwable[1];
++
++            // Some random variation, to help tickle races.
++            final Random rnd = new Random();
++            final boolean dojoin = rnd.nextBoolean();
++            final int JITTER = 1024;
++            final int iters1 = rnd.nextInt(JITTER);
++            final int iters2 = JITTER - iters1;
++            final AtomicInteger counter = new AtomicInteger(0);
++
++            Thread exiter = new Thread() {
++                public void run() {
++                    try {
++                        startingGate.await();
++                        for (int i = 0; i < iters1; i++)
++                            counter.getAndIncrement();
++                        System.exit(99);
++                    } catch (Throwable t) {
++                        t.printStackTrace();
++                        System.exit(86);
++                    }
++                }};
++            exiter.start();
++
++            startingGate.await();
++            for (int i = 0; i < iters2; i++)
++                counter.getAndIncrement();
++            // This may or may not result in a first call to
++            // Runtime.addShutdownHook after shutdown has already
++            // commenced.
++            LogManager log = LogManager.getLogManager();
++
++            if (dojoin) {
++                exiter.join();
++                if (thrown[0] != null)
++                    throw new Error(thrown[0]);
++                check(counter.get() == JITTER);
+             }
+-            LogManager log = LogManager.getLogManager();
+-            out.println("Test passed");
+-        }
+-        catch(Exception e) {
+-            e.printStackTrace();
+-            out.println("Test FAILED"); // Not expected
+-        }
+-    }
+-
+-    public void run() {
++        }
++    }
++
++    //----------------------------------------------------------------
++    // The rest of this test is copied from ProcessBuilder/Basic.java
++    //----------------------------------------------------------------
++    private static final String javaExe =
++        System.getProperty("java.home") +
++        File.separator + "bin" + File.separator + "java";
++
++    private static final String classpath =
++        System.getProperty("java.class.path");
++
++    private static final List<String> javaChildArgs =
++        Arrays.asList(new String[]
++            { javaExe, "-classpath", classpath,
++              "LoggingDeadlock2$JavaChild"});
++
++    private static class ProcessResults {
++        private final String out;
++        private final String err;
++        private final int exitValue;
++        private final Throwable throwable;
++
++        public ProcessResults(String out,
++                              String err,
++                              int exitValue,
++                              Throwable throwable) {
++            this.out = out;
++            this.err = err;
++            this.exitValue = exitValue;
++            this.throwable = throwable;
++        }
++
++        public String out()          { return out; }
++        public String err()          { return err; }
++        public int exitValue()       { return exitValue; }
++        public Throwable throwable() { return throwable; }
++
++        public String toString() {
++            StringBuilder sb = new StringBuilder();
++            sb.append("<STDOUT>\n" + out() + "</STDOUT>\n")
++                .append("<STDERR>\n" + err() + "</STDERR>\n")
++                .append("exitValue = " + exitValue + "\n");
++            if (throwable != null)
++                sb.append(throwable.getStackTrace());
++            return sb.toString();
++        }
++    }
++
++    private static class StreamAccumulator extends Thread {
++        private final InputStream is;
++        private final StringBuilder sb = new StringBuilder();
++        private Throwable throwable = null;
++
++        public String result () throws Throwable {
++            if (throwable != null)
++                throw throwable;
++            return sb.toString();
++        }
++
++        StreamAccumulator (InputStream is) {
++            this.is = is;
++        }
++
++        public void run() {
++            try {
++                Reader r = new InputStreamReader(is);
++                char[] buf = new char[4096];
++                int n;
++                while ((n = r.read(buf)) > 0) {
++                    sb.append(buf,0,n);
++                }
++            } catch (Throwable t) {
++                throwable = t;
++            } finally {
++                try { is.close(); }
++                catch (Throwable t) { throwable = t; }
++            }
++        }
++    }
++
++    private static ProcessResults run(Process p) {
++        Throwable throwable = null;
++        int exitValue = -1;
++        String out = "";
++        String err = "";
++
++        StreamAccumulator outAccumulator =
++            new StreamAccumulator(p.getInputStream());
++        StreamAccumulator errAccumulator =
++            new StreamAccumulator(p.getErrorStream());
++
+         try {
+-            synchronized(lock) {
+-                c++;
+-                if (c == 2) lock.notify();
+-                else lock.wait();
+-            }
+-            System.exit(1);
+-        }
+-        catch(Exception e) {
+-            e.printStackTrace();
+-            out.println("Test FAILED"); // Not expected
+-        }
+-    }
++            outAccumulator.start();
++            errAccumulator.start();
++
++            exitValue = p.waitFor();
++
++            outAccumulator.join();
++            errAccumulator.join();
++
++            out = outAccumulator.result();
++            err = errAccumulator.result();
++        } catch (Throwable t) {
++            throwable = t;
++        }
++
++        return new ProcessResults(out, err, exitValue, throwable);
++    }
++
++    //--------------------- Infrastructure ---------------------------
++    static volatile int passed = 0, failed = 0;
++    static void pass() {passed++;}
++    static void fail() {failed++; Thread.dumpStack();}
++    static void fail(String msg) {System.out.println(msg); fail();}
++    static void unexpected(Throwable t) {failed++; t.printStackTrace();}
++    static void check(boolean cond) {if (cond) pass(); else fail();}
++    static void check(boolean cond, String m) {if (cond) pass(); else fail(m);}
++    static void equal(Object x, Object y) {
++        if (x == null ? y == null : x.equals(y)) pass();
++        else fail(x + " not equal to " + y);}
++    public static void main(String[] args) throws Throwable {
++        try {realMain(args);} catch (Throwable t) {unexpected(t);}
++        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
++        if (failed > 0) throw new AssertionError("Some tests failed");}
+ }


From dbhole at icedtea.classpath.org  Wed Feb  3 08:59:53 2010
From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org)
Date: Wed, 03 Feb 2010 16:59:53 +0000
Subject: /hg/icedtea6: Encode new lines, carriage returns, and other spec...
Message-ID: <hg.c399b5cbbbaf.1265216393.2873452341184383832@icedtea.classpath.org>

changeset c399b5cbbbaf in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c399b5cbbbaf
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Feb 03 11:59:46 2010 -0500

	Encode new lines, carriage returns, and other special characters
	before sending them to Java side (de-coding code is already in
	effect on Java side).


diffstat:

2 files changed, 38 insertions(+), 4 deletions(-)
ChangeLog                           |    7 +++++++
plugin/icedteanp/IcedTeaNPPlugin.cc |   35 +++++++++++++++++++++++++++++++----

diffs (62 lines):

diff -r 55c898e59858 -r c399b5cbbbaf ChangeLog
--- a/ChangeLog	Wed Feb 03 13:30:49 2010 +0100
+++ b/ChangeLog	Wed Feb 03 11:59:46 2010 -0500
@@ -1,3 +1,10 @@ 2010-02-03 Pavel Tisnovsky <ptisnovs at red
+2010-02-03  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/IcedTeaNPPlugin.cc 
+	(plugin_create_applet_tag): Encode new lines, carriage returns, and other
+	special characters before sending them to Java side (de-coding code is
+	already in effect on Java side).
+
 2010-02-03 Pavel Tisnovsky <ptisnovs at redhat.com>
 
 	* Makefile.am: Add new patch.
diff -r 55c898e59858 -r c399b5cbbbaf plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Feb 03 13:30:49 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Feb 03 11:59:46 2010 -0500
@@ -1575,13 +1575,40 @@ plugin_create_applet_tag (int16_t argc, 
           // characters will pass through the pipe.
           if (argv[i] != '\0')
             {
-              gchar* escaped = NULL;
-
-              escaped = g_strescape (argv[i], NULL);
+              // worst case scenario -> all characters are newlines or
+              // returns, each of which translates to 5 substitutions
+              char* escaped = (char*) calloc(((strlen(argv[i])*5)+1), sizeof(char));
+
+              strcpy(escaped, "");
+              for (int j=0; j < strlen(argv[i]); j++)
+              {
+                  if (argv[i][j] == '\r')
+                      strcat(escaped, "&#13;");
+                  else if (argv[i][j] == '\n')
+                      strcat(escaped, "&#10;");
+                  else if (argv[i][j] == '>')
+                      strcat(escaped, "&gt;");
+                  else if (argv[i][j] == '<')
+                      strcat(escaped, "&lt;");
+                  else if (argv[i][j] == '&')
+                      strcat(escaped, "&amp;");
+                  else
+                  {
+                      char* orig_char = (char*) calloc(2, sizeof(char));
+                      orig_char[0] = argv[i][j];
+                      orig_char[1] = '\0';
+
+                      strcat(escaped, orig_char);
+
+                      free(orig_char);
+                      orig_char = NULL;
+                  }
+              }
+
               parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn[i],
                                         "\" VALUE=\"", escaped, "\">", NULL);
 
-              g_free (escaped);
+              free (escaped);
               escaped = NULL;
             }
         }


From xerxes at zafena.se  Wed Feb  3 16:04:06 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Thu, 04 Feb 2010 01:04:06 +0100
Subject: RFC: [patch] Shark host CPU capabilities autotuner.
Message-ID: <4B6A0EF6.80309@zafena.se>

Hi!

The attached patch adds a host CPU features autotuner for Shark by using
new API's found in llvm 2.7.

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp :
    (SharkCompiler::SharkCompiler): Implement host CPU feature
    autotuner using LLVM 2.7 APIs.
    * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp :
    Define llvm/ADT/StringMap.h and llvm/System/Host.h
    depending on LLVM version.
    Allways define llvm/Support/CommandLine.h.

This patch will become more and more usefull over time when
llvm/System/Host.cpp gets filled with actual host detection code for
various targets.

Cheers
Xerxes


-------------- next part --------------
A non-text attachment was scrubbed...
Name: autotune_llvm_jit.patch
Type: text/x-patch
Size: 1892 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100204/aee0f30b/autotune_llvm_jit.patch 

From bugzilla-daemon at icedtea.classpath.org  Wed Feb  3 19:51:46 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 04 Feb 2010 03:51:46 +0000
Subject: [Bug 395] firefox with openjdk-plugin hangs whenever jmol app is used
Message-ID: <E1Ncsks-0003Yg-E1@icedtea.classpath.org>

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


pcpa at mandriva.com.br changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|All                         |x86




------- Comment #1 from pcpa at mandriva.com.br  2010-02-04 03:51 -------
  This problem did only happen in i586.
  This is no longer an issue with icedtea 1.7 and npplugin,
but should still be an issue for icedtea 1.6.
  It did hang with any java applets, not just jmol.


-- 
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 Feb  3 19:53:35 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 04 Feb 2010 03:53:35 +0000
Subject: [Bug 395] firefox with openjdk-plugin hangs whenever jmol app is used
Message-ID: <E1Ncsmd-0003ZE-33@icedtea.classpath.org>

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





------- Comment #2 from pcpa at mandriva.com.br  2010-02-04 03:53 -------
Created an attachment (id=294)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=294&action=view)
The patch that was required to resolve 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 ed at camswl.com  Thu Feb  4 10:06:28 2010
From: ed at camswl.com (ed at camswl.com)
Date: Thu, 4 Feb 2010 18:06:28 GMT
Subject: RTC Thumb2 JIT default build
Message-ID: <201002041806.o14I6Sia025617@mint.camswl.com>

Hi folks,

The following patch will make the Thumb2 JIT the default build.

OK to commit?

Regards,
Ed.

--- CUT HERE ---------------------------------------------------------------------------
diff -ruNE old/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- old/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2010-02-04 11:20:25.000000000 +0000
+++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	2010-02-04 14:22:42.000000000 +0000
@@ -15,6 +15,11 @@
 @ 2 along with this work; if not, write to the Free Software Foundation,
 @ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 
+#undef THUMB2EE
+#if !defined(DISABLE_THUMB2) && defined(HOTSPOT_ASM) && !defined(SHARK)
+#define THUMB2EE
+#endif
+
 #ifdef HOTSPOT_ASM
 
 #define ARMv4
diff -ruNE old/icedtea6/ports/hotspot/src/cpu/zero/vm/thumb2.cpp new/icedtea6/ports/hotspot/src/cpu/zero/vm/thumb2.cpp
--- old/icedtea6/ports/hotspot/src/cpu/zero/vm/thumb2.cpp	2010-02-04 11:20:25.000000000 +0000
+++ new/icedtea6/ports/hotspot/src/cpu/zero/vm/thumb2.cpp	2010-02-04 14:23:16.000000000 +0000
@@ -16,6 +16,11 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#undef THUMB2EE
+#if !defined(DISABLE_THUMB2) && defined(HOTSPOT_ASM) && !defined(SHARK)
+#define THUMB2EE
+#endif
+
 #ifdef THUMB2EE
 
 #define T2EE_PRINT_COMPILATION


From doko at ubuntu.com  Thu Feb  4 10:33:39 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Thu, 04 Feb 2010 19:33:39 +0100
Subject: RTC Thumb2 JIT default build
In-Reply-To: <201002041806.o14I6Sia025617@mint.camswl.com>
References: <201002041806.o14I6Sia025617@mint.camswl.com>
Message-ID: <4B6B1303.9050301@ubuntu.com>

On 04.02.2010 19:06, ed at camswl.com wrote:
> Hi folks,
>
> The following patch will make the Thumb2 JIT the default build.
>
> OK to commit?

how does this work with shark, or should this only be enabled when not building 
shark? See https://bugs.launchpad.net/bugs/513735

   Matthias


From xerxes at zafena.se  Thu Feb  4 13:20:34 2010
From: xerxes at zafena.se (Xerxes Ranby)
Date: Thu, 04 Feb 2010 22:20:34 +0100
Subject: RTC Thumb2 JIT default build
In-Reply-To: <4B6B1303.9050301@ubuntu.com>
References: <201002041806.o14I6Sia025617@mint.camswl.com>
	<4B6B1303.9050301@ubuntu.com>
Message-ID: <4B6B3A22.8080709@zafena.se>

Matthias Klose wrote:
> On 04.02.2010 19:06, ed at camswl.com wrote:
>> Hi folks,
>>
>> The following patch will make the Thumb2 JIT the default build.
>>
>> OK to commit?
>
> how does this work with shark, or should this only be enabled when not 
> building shark? See https://bugs.launchpad.net/bugs/513735
>
>   Matthias
Ed's patch looks ok in reguard to shark since it undefines the thumb2 
jit if shark are defined!

If the t2 jit would be built into the same binary as shark then we would 
get a binary that report shark mixed-mode vm but only runs t2 jited code 
and that would be kind of odd and should be avoided.

Im in favour for the t2 jit to be enabled in the default build using 
this patch!
Cheers
Xerxes


From gbenson at redhat.com  Fri Feb  5 02:41:26 2010
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 5 Feb 2010 05:41:26 -0500
Subject: RFC: [patch] Shark host CPU capabilities autotuner.
In-Reply-To: <4B6A0EF6.80309@zafena.se>
References: <4B6A0EF6.80309@zafena.se>
Message-ID: <20100205104125.GA5933@shell.devel.redhat.com>

Xerxes R?nby wrote:
> The attached patch adds a host CPU features autotuner for Shark by using
> new API's found in llvm 2.7.
> 
>     * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp :
>     (SharkCompiler::SharkCompiler): Implement host CPU feature
>     autotuner using LLVM 2.7 APIs.
>     * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp :
>     Define llvm/ADT/StringMap.h and llvm/System/Host.h
>     depending on LLVM version.
>     Allways define llvm/Support/CommandLine.h.
> 
> This patch will become more and more usefull over time when
> llvm/System/Host.cpp gets filled with actual host detection code for
> various targets.

Commit away :)

Cheers,
Gary

-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Fri Feb  5 13:10:50 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Fri, 05 Feb 2010 21:10:50 +0000
Subject: [Bug 423] Iced tea openjdk1.6 and jdk1.7 crashes in remote x server
	(cygwin) environment
Message-ID: <E1NdVRy-0005Dd-Hv@icedtea.classpath.org>

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





------- Comment #3 from balajiraman at ge.com  2010-02-05 21:10 -------
Created an attachment (id=295)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=295&action=view)
Crash dump with xrenderer on in remote x server environment

I tried to run valgrind on the app as i couldnt get any crash dump in normal
running scenario.
Here is the command below and the trace i got along with the crash dump.

valgrind --trace-children=yes --leak-check=yes --xml=yes
--xml-file=./xrender.log --smc-check=all
--db-command=/usr/lib64/jvm/java-1.6.0-openjdk-1.6.0/bin/jdb
/usr/lib64/jvm/java-1.6.0-openjdk-1.6.0/bin/java -Dsun.java2d.xrender=True
TestSwing
XRender pipeline enabled
vex amd64->IR: unhandled instruction bytes: 0x48 0xF 0xAE 0x4 0x24 0x49
==20939== valgrind: Unrecognised instruction at address 0x773dc46.
==20939== Your program just tried to execute an instruction that Valgrind
==20939== did not recognise.  There are two possible reasons for this.
==20939== 1. Your program has a bug and erroneously jumped to a non-code
==20939==    location.  If you are running Memcheck and you just saw a
==20939==    warning about a bad jump, it's probably your program's fault.
==20939== 2. The instruction is legitimate but Valgrind doesn't handle it,
==20939==    i.e. it's Valgrind's fault.  If you think this is the case or
==20939==    you are not sure, please let us know and we'll try to fix it.
==20939== Either way, Valgrind will now raise a SIGILL signal which will
==20939== probably kill your program.


-- 
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 Feb  5 22:49:50 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 06 Feb 2010 06:49:50 +0000
Subject: [Bug 316] unexpected error
Message-ID: <E1NdeUI-0005T4-PF@icedtea.classpath.org>

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





------- Comment #2 from mspang at csclub.uwaterloo.ca  2010-02-06 06:49 -------
Created an attachment (id=296)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=296&action=view)
additional error log

Also happened here. We are not manipulating zip files directly so it must be
due to jar file accesses.


-- 
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 Feb  6 09:38:45 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 06 Feb 2010 17:38:45 +0000
Subject: [Bug 438] New: PulseAudioSourceDataLine falsely returns true to
	isControlSupported(Gain)
Message-ID: <E1NdocH-0005ur-EG@icedtea.classpath.org>

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

           Summary: PulseAudioSourceDataLine falsely returns true to
                    isControlSupported(Gain)
           Product: IcedTea
           Version: 6-1.0
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea6
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: masory at sas.upenn.edu


PulseAudioSourceDataLine returns true for
isControlSupported(FloatControl.Type.MASTER_GAIN), but upon actual gain
adjustment throws the exception Master Gain Not Supported.
If the line doesn't support the control, it should return false to
isControlSupported(FloatControl.Type.MASTER_GAIN).


-- 
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 Feb  6 11:31:06 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 06 Feb 2010 19:31:06 +0000
Subject: [Bug 439] New: Build fails on 64-bit systems due to upstream XPCOM bug
Message-ID: <E1NdqN0-0005yH-3x@icedtea.classpath.org>

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

           Summary: Build fails on 64-bit systems due to upstream XPCOM bug
           Product: IcedTea
           Version: 6-1.7
          Platform: 64-bit
               URL: https://bugzilla.mozilla.org/show_bug.cgi?id=544688
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea6
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: david.ward at gatech.edu


The following error is produced when building IcedTea6 1.7 under 64-bit RHEL
5.4:

g++ -g -O2 \
          IcedTeaPlugin.o \
          -L/lib64 -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm
-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl
-lglib-2.0   \
          -L/usr/lib64/xulrunner-sdk-1.9/sdk/lib
-L/usr/lib64/xulrunner-sdk-1.9/lib -lmozjs -lxpcomglue_s -lxul -lxpcom -lplds4
-lplc4 -lnspr4 -lpthread -ldl   \
          -shared -o IcedTeaPlugin.so
/usr/bin/ld:
/usr/lib64/xulrunner-sdk-1.9/sdk/lib/libxpcomglue_s.a(nsThreadUtils.o):
relocation R_X86_64_PC32 against `nsIThreadManager::COMTypeInfo<int>::kIID' can
not be used when making a shared object; recompile with -fPIC


Further examination showed that libxpcomglue_s.a(nsThreadUtils.o) contains
R_X86_64_PC32 relocations, both in RHEL 5.4 and Ubuntu 9.10.  I have filed an
upstream bug 544688 with Mozilla regarding XPCOM to resolve 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 bcrow99 at hotmail.com  Sat Feb  6 15:44:00 2010
From: bcrow99 at hotmail.com (Brian Crowley)
Date: Sat, 6 Feb 2010 23:44:00 +0000
Subject: Hello
Message-ID: <SNT136-w567518952F526AB46487D9A4530@phx.gbl>


Hello everybody,
    My bright idea joining this group is to make the smallest possible kernel, completely chucking backwards compatibility, and then working backwards on compatibility.  

Brian Crowley
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100206/6965faaa/attachment.html 

From davidh at 7gen.com  Sat Feb  6 16:09:49 2010
From: davidh at 7gen.com (David Herron)
Date: Sat, 6 Feb 2010 16:09:49 -0800
Subject: Hello
In-Reply-To: <SNT136-w567518952F526AB46487D9A4530@phx.gbl>
References: <SNT136-w567518952F526AB46487D9A4530@phx.gbl>
Message-ID: <8bc8b8181002061609h23556ee9s1209f9f894edb9ea@mail.gmail.com>

This specific mailing list is meant for people packaging OpenJDK for
distribution through operating systems.  It has become the place where the
IcedTea project does its work.

Have you looked at Project Jigsaw?

- David Herron,
http://davidherron.com


On Sat, Feb 6, 2010 at 3:44 PM, Brian Crowley <bcrow99 at hotmail.com> wrote:

>  Hello everybody,
>     My bright idea joining this group is to make the smallest possible
> kernel, completely chucking backwards compatibility, and then working
> backwards on compatibility.
>
> Brian Crowley
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100206/37d6d43a/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Sun Feb  7 03:38:29 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 07 Feb 2010 11:38:29 +0000
Subject: [Bug 179] javascript script support through rhino should not be on
	bootclasspath
Message-ID: <E1Ne5TB-0006fy-RE@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

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




------- Comment #7 from gnu_andrew at member.fsf.org  2010-02-07 11:38 -------
Instead of just symlinking the system Rhino JAR, we need to create a copy with
the alternate namespace of com.sun.org.mozilla.   That means rewriting the
class files so we need to look for an appropriate solution for doing 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  Sun Feb  7 18:14:55 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 08 Feb 2010 02:14:55 +0000
Subject: [Bug 440] New: Crash: Assertion `stream' failed in
	Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1disconnect
Message-ID: <E1NeJ9L-00074t-Sx@icedtea.classpath.org>

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

           Summary: Crash: Assertion `stream' failed in
                    Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_
                    1stream_1disconnect
           Product: IcedTea
           Version: 6-1.4.1
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: major
          Priority: P2
         Component: IcedTea6
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: nhb_web at nexgo.de


I repeatably get this crash in Icedtea while playing the latest CVS version of
Stendhal. I am running pulseaudio in system daemon mode.

java:
/build/buildd/openjdk-6-6b14-1.4.1/build/../pulseaudio/src/native/org_class
path_icedtea_pulseaudio_Stream.c:519:
Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1disconnect
: Assertion `stream' failed.

With enabled java asserts this AssertionError is logged:

Caused by: java.lang.AssertionError
org.classpath.icedtea.pulseaudio.Stream.disconnect(Stream.java:491)
org.classpath.icedtea.pulseaudio.PulseAudioDataLine.connect(PulseAudioDataLine.java:277)
org.classpath.icedtea.pulseaudio.PulseAudioDataLine.open(PulseAudioDataLine.java:102)
org.classpath.icedtea.pulseaudio.PulseAudioSourceDataLine.open(PulseAudioSourceDataLine.java:75)
org.classpath.icedtea.pulseaudio.PulseAudioDataLine.open(PulseAudioDataLine.java:296)
org.classpath.icedtea.pulseaudio.PulseAudioSourceDataLine.open(PulseAudioSourceDataLine.java:51)
games.stendhal.client.sound.system.SoundSystem.openOutput(SoundSystem.java:209)


-- 
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 Feb  7 18:45:48 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 08 Feb 2010 02:45:48 +0000
Subject: [Bug 440] Crash: Assertion `stream' failed in
	Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1disconnect
Message-ID: <E1NeJdE-00075R-Se@icedtea.classpath.org>

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





------- Comment #1 from nhb_web at nexgo.de  2010-02-08 02:45 -------
The problem does not occur on Sun Java.

In case asserts are enabled in Java, it is possible to catch the AssertError
and continue as if nothing had happened. But if they are disabled the assert in
native code kills the program.

Is there a possible workaround in program code that does not requires us to
teach users how to enable asserts?


-- 
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 Feb  8 03:04:10 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 08 Feb 2010 11:04:10 +0000
Subject: [Bug 441] New: make hotspot fails on --with-openjdk builds
Message-ID: <E1NeRPV-0007Vm-RX@icedtea.classpath.org>

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

           Summary: make hotspot fails on --with-openjdk builds
           Product: IcedTea
           Version: 6-hg
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea6
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: gnu_andrew at member.fsf.org


The make hotspot target assumes a full bootstrap build has been configured and
fails if configure has actually been passed --with-openjdk:

andrew at rivendell /tmp/icedtea6 $ make hotspot
rm -f stamps/bootstrap-directory-symlink-ecj.stamp
rm -f stamps/icedtea-ecj.stamp
rm -f stamps/icedtea-against-ecj.stamp
/usr/bin/make hotspot-helper
make[1]: Entering directory `/tmp/icedtea6'
mkdir -p stamps ; \
        if test "xno" != "xno"; then \
          no -g -O2 -Wl,-Bsymbolic -findirect-dispatch -o native-ecj \
            --main=org.eclipse.jdt.internal.compiler.batch.Main  ; \
        fi ; \
        touch stamps/native-ecj.stamp
mkdir -p bootstrap/ecj/bin stamps/
ln -sf /usr/lib/jvm/icedtea6/bin/java bootstrap/ecj/bin/java
ln -sf /usr/lib/jvm/icedtea6/bin/javah bootstrap/ecj/bin/javah
ln -sf /usr/lib/jvm/icedtea6/bin/rmic bootstrap/ecj/bin/rmic
ln -sf /usr/lib/jvm/icedtea6/bin/jar bootstrap/ecj/bin/jar
ln -sf ../../../javac bootstrap/ecj/bin/javac
ln -sf ../../../javap bootstrap/ecj/bin/javap
mkdir -p bootstrap/ecj/lib/endorsed
ln -sf  bootstrap/ecj/lib/endorsed/xalan-j2.jar
ln -sf  \
          bootstrap/ecj/lib/endorsed/xalan-j2-serializer.jar
ln -sf  bootstrap/ecj/lib/endorsed/xerces-j2.jar
mkdir -p bootstrap/ecj/jre/lib; \
        ln -sf /jre/lib/amd64 \
          bootstrap/ecj/jre/lib/; \
        if ! test -d bootstrap/ecj/jre/lib/amd64; \
          then \
          ln -sf ./amd64 \
            bootstrap/ecj/jre/lib/amd64; \
        fi; \
        mkdir -p bootstrap/ecj/include; \
        for i in /include/*; do \
          test -r $i | continue; \
          i=`basename $i`; \
          rm -f bootstrap/ecj/include/$i; \
          ln -s /include/$i bootstrap/ecj/include/$i; \
        done; \
        if test -f /tmp/icedtea6/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
        then \
          mkdir -p /tmp/icedtea6/bootstrap/ecj/lib ; \
          ln -sf /tmp/icedtea6/bootstrap/jdk1.7.0/jre/lib/tools.jar \
            /tmp/icedtea6/bootstrap/ecj/lib/tools.jar ; \
        fi
if test -f \
          /tmp/icedtea6/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar ; \
        then \
          cp /tmp/icedtea6/bootstrap/jdk1.7.0/jre/lib/rt-closed.jar \
            /tmp/icedtea6/bootstrap/ecj/jre/lib/rt.jar ; \
        fi
mkdir -p stamps
touch stamps/bootstrap-directory-ecj.stamp
rm -f bootstrap/jdk1.6.0
ln -sf ecj bootstrap/jdk1.6.0
mkdir -p stamps
touch stamps/bootstrap-directory-symlink-ecj.stamp
for copy_dir in \
          `cat
/home/andrew/projects/openjdk/icedtea6/tools-copy/tools-jdk-copy-files.txt` ; \
        do \
          mkdir -p hotspot-tools/$copy_dir ; \
          cp -pPRf openjdk/jdk/src/share/classes/$copy_dir/* \
            hotspot-tools/$copy_dir ; \
        done
cp: cannot stat `openjdk/jdk/src/share/classes/org/relaxng/datatype//*': No
such file or directory
cp: cannot stat
`openjdk/jdk/src/share/classes/org/relaxng/datatype/helpers//*': No such file
or directory
for copy_dir in \
          `cat
/home/andrew/projects/openjdk/icedtea6/tools-copy/tools-langtools-copy-files.txt`
; \
        do \
          mkdir -p hotspot-tools/$copy_dir ; \
          cp -pPRf openjdk/langtools/src/share/classes/$copy_dir/* \
            hotspot-tools/$copy_dir ; \
        done
for copy_dir in \
          `cat
/home/andrew/projects/openjdk/icedtea6/tools-copy/tools-corba-copy-files.txt` ;
\
        do \
          mkdir -p hotspot-tools/$copy_dir ; \
          cp -pPRf openjdk/corba/src/share/classes/$copy_dir/* \
            hotspot-tools/$copy_dir ; \
        done
for copy_dir in \
          `cat
/home/andrew/projects/openjdk/icedtea6/tools-copy/tools-jaxws-copy-files.txt` ;
\
        do \
          mkdir -p hotspot-tools/$copy_dir ; \
          cp -pPRf openjdk/jaxws/src/share/classes/$copy_dir/* \
            hotspot-tools/$copy_dir ; \
        done
mkdir -p stamps
touch stamps/hotspot-tools-copy-source-files.stamp
find hotspot-tools -name '*.java' | sort > hotspot-tools-source-files.txt
mkdir -p lib/hotspot-tools
/tmp/icedtea6/bootstrap/jdk1.6.0/bin/javac -J-Xmx1024m -g \
          -d lib/hotspot-tools \
          -source 1.5 \
          -sourcepath \
           
'hotspot-tools:openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/share/classes:openjdk/jaxws/src/share/classes:/tmp/icedtea6/generated:/tmp/icedtea6/rt:/home/andrew/projects/openjdk/icedtea6/rt:/home/andrew/projects/openjdk/icedtea6/plugin/icedteanp/java'
\
          -classpath \'\' -bootclasspath \'\' @hotspot-tools-source-files.txt ;
/bin/sh: /tmp/icedtea6/bootstrap/jdk1.6.0/bin/javac: No such file or directory
make[1]: *** [stamps/hotspot-tools-class-files.stamp] Error 127
make[1]: Leaving directory `/tmp/icedtea6'
make: *** [hotspot] 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  Mon Feb  8 03:04:30 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 08 Feb 2010 11:04:30 +0000
Subject: [Bug 441] make hotspot fails on --with-openjdk builds
Message-ID: <E1NeRPq-0007Vq-BZ@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org 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  Mon Feb  8 03:04:53 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 08 Feb 2010 11:04:53 +0000
Subject: [Bug 441] make hotspot fails on --with-openjdk builds
Message-ID: <E1NeRQD-0007Vv-Ar@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org
                   |.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 enevill at icedtea.classpath.org  Tue Feb  9 01:15:39 2010
From: enevill at icedtea.classpath.org (enevill at icedtea.classpath.org)
Date: Tue, 09 Feb 2010 09:15:39 +0000
Subject: /hg/icedtea6: Make Thumb2 JIT the default build
Message-ID: <hg.748156804502.1265706939.2873452341184383832@icedtea.classpath.org>

changeset 748156804502 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=748156804502
author: Edward Nevill <ed at camswl.com>
date: Tue Feb 09 09:15:27 2010 +0000

	Make Thumb2 JIT the default build


diffstat:

3 files changed, 15 insertions(+)
ChangeLog                                          |    5 +++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S |    5 +++++
ports/hotspot/src/cpu/zero/vm/thumb2.cpp           |    5 +++++

diffs (42 lines):

diff -r c399b5cbbbaf -r 748156804502 ChangeLog
--- a/ChangeLog	Wed Feb 03 11:59:46 2010 -0500
+++ b/ChangeLog	Tue Feb 09 09:15:27 2010 +0000
@@ -1,3 +1,8 @@ 2010-02-03  Deepak Bhole <dbhole at redhat.
+2010-02-09  Edward Nevill <ed at camswl.com>
+
+	* cppInterpreter_arm.S / thumb2.cpp
+	Make Thumb2 JIT the default build
+
 2010-02-03  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/IcedTeaNPPlugin.cc 
diff -r c399b5cbbbaf -r 748156804502 ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Wed Feb 03 11:59:46 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S	Tue Feb 09 09:15:27 2010 +0000
@@ -14,6 +14,11 @@
 @ 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.
+
+#undef THUMB2EE
+#if !defined(DISABLE_THUMB2) && defined(HOTSPOT_ASM) && !defined(SHARK)
+#define THUMB2EE
+#endif
 
 #ifdef HOTSPOT_ASM
 
diff -r c399b5cbbbaf -r 748156804502 ports/hotspot/src/cpu/zero/vm/thumb2.cpp
--- a/ports/hotspot/src/cpu/zero/vm/thumb2.cpp	Wed Feb 03 11:59:46 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/thumb2.cpp	Tue Feb 09 09:15:27 2010 +0000
@@ -15,6 +15,11 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
+#undef THUMB2EE
+#if !defined(DISABLE_THUMB2) && defined(HOTSPOT_ASM) && !defined(SHARK)
+#define THUMB2EE
+#endif
 
 #ifdef THUMB2EE
 


From bugzilla-daemon at icedtea.classpath.org  Tue Feb  9 02:23:11 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 09 Feb 2010 10:23:11 +0000
Subject: [Bug 435] icedtea6-1.6.2 unable to compile icedtea6-1.7 due to
	segfault
Message-ID: <E1NenFP-0008Kc-Uy@icedtea.classpath.org>

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





------- Comment #10 from devurandom at gmx.net  2010-02-09 10:23 -------
Created an attachment (id=297)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=297&action=view)
build.log (icedtea-bin-6.1.7 building icedtea-6.1.7)

Another try, building icedtea-6.1.7 using icedtea-bin-6.1.7 instead of
gcj-jdk-4.3-r4.


-- 
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 Feb  9 02:27:10 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 09 Feb 2010 10:27:10 +0000
Subject: [Bug 435] icedtea6-1.6.2 unable to compile icedtea6-1.7 due to
	segfault
Message-ID: <E1NenJG-0008Km-Hq@icedtea.classpath.org>

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





------- Comment #11 from devurandom at gmx.net  2010-02-09 10:27 -------
Created an attachment (id=298)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=298&action=view)
hs_err.log (icedtea-bin-6.1.7 building icedtea-6.1.7)

This time the crash is in "Unknown thread", java stack:
java.lang.Thread.<clinit>.


-- 
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 Feb  9 02:29:12 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 09 Feb 2010 10:29:12 +0000
Subject: [Bug 435] unable to compile icedtea-6.1.7: interpreter segfault in
	java.lang.Thread.<clinit>
Message-ID: <E1NenLE-0008L2-Fd@icedtea.classpath.org>

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


devurandom at gmx.net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
            Summary|icedtea6-1.6.2 unable to    |unable to compile icedtea-
                   |compile icedtea6-1.7 due to |6.1.7: interpreter segfault
                   |segfault                    |in java.lang.Thread.<clinit>




------- Comment #12 from devurandom at gmx.net  2010-02-09 10:29 -------
Updating summary with a guess and updated version numbers.


-- 
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 rgb2x0 at googlemail.com  Wed Feb 10 03:49:05 2010
From: rgb2x0 at googlemail.com (B R)
Date: Wed, 10 Feb 2010 03:49:05 -0800
Subject: Icedtea6-1.7 Plugin with chromium constantly segfaults
Message-ID: <962a36261002100349o53e534fejf9244c7470700eed@mail.gmail.com>

Hi,

I am a user of Icedtea plugin with chromium.
Since the last version (Icedtea6-1.7-r1) on gentoo, segfaults occur
everytime a java applet  is loaded, sometimes leading to
chrome segfaulting then crashing  the plugin.

The question is, how can I get meaningfull backtraces about those errors.
Where do I have to start to give you interesting thing to working on and by
the way learn about debuging.

The only thing I got for now is :

Segmentation fault occurred at 4e6a6100 in
/opt/icedtea6-bin-1.7/jre/bin/java[java:5259] uid/euid:1000/1000
gid/egid:1004/1004, parent /opt/
chromium.org/chrome-linux/chrome[chrome:5232] uid/euid:1000/1000
gid/egid:1004/1004

[ 6479.550127] grsec: denied resource overstep by requesting 69632 for
RLIMIT_MEMLOCK against limit 65536 for
/opt/chromium.org/chrome-linux/chrome[chrome:4981] uid/euid:1000/1000
gid/egid:1004/1004, parent
/opt/chromium.org/chrome-linux/chrome[chrome:4073] uid/euid:1000/1000
gid/egid:1004/1004

chrome[5232]: segfault at 51705fcf ip 50b3c7b0 sp 51705fc0 error 7 in
libstdc++.so.6.0.10[50a84000+e2000]

Thank you for your help.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100210/dcfd2e81/attachment.html 

From bugzilla-daemon at icedtea.classpath.org  Wed Feb 10 12:16:36 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:16:36 +0000
Subject: [Bug 185] Application SweetHome 3D crashes when i want to print
Message-ID: <E1NfIzE-0001Pm-0n@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|blocker                     |normal




-- 
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 Feb 10 12:17:32 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:17:32 +0000
Subject: [Bug 316] unexpected error
Message-ID: <E1NfJ08-0001Pw-JW@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal




------- Comment #3 from gnu_andrew at member.fsf.org  2010-02-10 20:17 -------
Needs information on how to reproduce this 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  Wed Feb 10 12:18:21 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:18:21 +0000
Subject: [Bug 322] Thread#GetContextClassLoader() throws in IcedTeaPlugin
Message-ID: <E1NfJ0v-0001Q5-C9@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal




-- 
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 Feb 10 12:19:33 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:19:33 +0000
Subject: [Bug 379] JVM failed while running an external library
Message-ID: <E1NfJ25-0001QE-DI@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal




------- Comment #3 from gnu_andrew at member.fsf.org  2010-02-10 20:19 -------
Please post steps on how to reproduce this bug or it will be closed as 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 Feb 10 12:30:46 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:30:46 +0000
Subject: [Bug 380] An unexpected error has been detected by Java Runtime
	Environment:
Message-ID: <E1NfJCw-0001RE-LX@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|blocker                     |normal




------- Comment #2 from gnu_andrew at member.fsf.org  2010-02-10 20:30 -------
Please provide information on how to reproduce this crash.


-- 
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 Feb 10 12:31:22 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:31:22 +0000
Subject: [Bug 408] SIGSEGV: JavaThread "Java2D Disposer" crashes JVM
Message-ID: <E1NfJDW-0001RN-QV@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal




-- 
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 Feb 10 12:32:32 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:32:32 +0000
Subject: [Bug 293] JVM fatal error in VM code (HS 14) after NetworkManager
	disable / reenable cycle
Message-ID: <E1NfJEe-0001Rt-RQ@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal




-- 
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 Feb 10 12:32:40 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 20:32:40 +0000
Subject: [Bug 362] setPreferedSize without layout manager works on Sun.
Message-ID: <E1NfJEm-0001SC-Rs@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|blocker                     |normal




-- 
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 Feb 10 13:12:51 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:12:51 +0000
Subject: [Bug 378] Gecko Browsers crashes due to IcedTeaPluginFactory
Message-ID: <E1NfJrf-0001TL-Jr@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal




-- 
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 Feb 10 13:13:23 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:13:23 +0000
Subject: [Bug 376] Cannot create GC thread. Out of system resources.
Message-ID: <E1NfJsB-0001TW-HJ@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal




-- 
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 Feb 10 13:13:31 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:13:31 +0000
Subject: [Bug 395] firefox with openjdk-plugin hangs whenever jmol app is used
Message-ID: <E1NfJsJ-0001Td-CV@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal




-- 
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 Feb 10 13:13:40 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:13:40 +0000
Subject: [Bug 410] Applet resource loading fails
Message-ID: <E1NfJsS-0001Tm-5K@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal




-- 
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 Feb 10 13:19:11 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:19:11 +0000
Subject: [Bug 426] normal Eclipse update crash (SIGSEGV)
Message-ID: <E1NfJxn-0001U7-Tr@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal




------- Comment #2 from gnu_andrew at member.fsf.org  2010-02-10 21:19 -------
Please give details on how to reproduce this bug or it will be 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 bugzilla-daemon at icedtea.classpath.org  Wed Feb 10 13:21:17 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:21:17 +0000
Subject: [Bug 437] YaCy crashed with SIGSEGV
Message-ID: <E1NfJzp-0001UL-LQ@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal
           Platform|64-bit                      |x86_64




-- 
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 Feb 10 13:22:00 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:22:00 +0000
Subject: [Bug 440] Crash: Assertion `stream' failed in
	Java_org_classpath_icedtea_pulseaudio_Stream_native_1pa_1stream_1disconnect
Message-ID: <E1NfK0W-0001UW-5c@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal
          Component|IcedTea6                    |PulseAudio




-- 
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 Feb 10 13:22:30 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 10 Feb 2010 21:22:30 +0000
Subject: [Bug 138] jdk6 - GPL-compatible free software licenses and documented
	copyrights and licenses
Message-ID: <E1NfK10-0001Un-MN@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|major                       |normal
          Component|IcedTea6                    |Licensing




-- 
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  Thu Feb 11 17:25:42 2010
From: dbhole at redhat.com (Deepak Bhole)
Date: Thu, 11 Feb 2010 20:25:42 -0500
Subject: Icedtea6-1.7 Plugin with chromium constantly segfaults
In-Reply-To: <962a36261002100349o53e534fejf9244c7470700eed@mail.gmail.com>
References: <962a36261002100349o53e534fejf9244c7470700eed@mail.gmail.com>
Message-ID: <20100212012542.GA18694@redhat.com>

* B R <rgb2x0 at googlemail.com> [2010-02-10 07:01]:
> Hi,
> 
> I am a user of Icedtea plugin with chromium.
> Since the last version (Icedtea6-1.7-r1) on gentoo, segfaults occur everytime a
> java applet  is loaded, sometimes leading to chrome segfaulting then crashing  
> the plugin.
> 
> The question is, how can I get meaningfull backtraces about those errors. Where
> do I have to start to give you interesting thing to working on and by the way
> learn about debuging.
> 
> The only thing I got for now is :
> 
> Segmentation fault occurred at 4e6a6100 in /opt/icedtea6-bin-1.7/jre/bin/java
> [java:5259] uid/euid:1000/1000 gid/egid:1004/1004, parent /opt/chromium.org/
> chrome-linux/chrome[chrome:5232] uid/euid:1000/1000 gid/egid:1004/1004
> 
> [ 6479.550127] grsec: denied resource overstep by requesting 69632 for RLIMIT_MEMLOCK against limit 65536 for /opt/chromium.org/chrome-linux/chrome[chrome:4981] uid/euid:1000/1000 gid/egid:1004/1004, parent /opt/chromium.org/chrome-linux/chrome[chrome:4073] uid/euid:1000/1000 gid/egid:1004/1004 
> 
> chrome[5232]: segfault at 51705fcf ip 50b3c7b0 sp 51705fc0 error 7 in
> libstdc++.so.6.0.10[50a84000+e2000]
> 


Can you start it as 'ICEDTEAPLUGIN_DEBUG=true chromium 2>&1 | tee
console.log' and then post the console.log file and the
~/.icedteaplugin/java.std* files?

Thanks!
Deepak



From gbenson at icedtea.classpath.org  Fri Feb 12 05:24:33 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Fri, 12 Feb 2010 13:24:33 +0000
Subject: /hg/icedtea6: Strip stupid options that llvm-config supplies
Message-ID: <hg.fc600c234771.1265981073.2873452341184383832@icedtea.classpath.org>

changeset fc600c234771 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fc600c234771
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 12 13:24:25 2010 +0000

	Strip stupid options that llvm-config supplies


diffstat:

2 files changed, 36 insertions(+), 5 deletions(-)
ChangeLog    |    4 ++++
configure.ac |   37 ++++++++++++++++++++++++++++++++-----

diffs (59 lines):

diff -r 748156804502 -r fc600c234771 ChangeLog
--- a/ChangeLog	Tue Feb 09 09:15:27 2010 +0000
+++ b/ChangeLog	Fri Feb 12 13:24:25 2010 +0000
@@ -1,3 +1,7 @@ 2010-02-09  Edward Nevill <ed at camswl.com
+2010-02-12  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Strip stupid options that llvm-config supplies.
+
 2010-02-09  Edward Nevill <ed at camswl.com>
 
 	* cppInterpreter_arm.S / thumb2.cpp
diff -r 748156804502 -r fc600c234771 configure.ac
--- a/configure.ac	Tue Feb 09 09:15:27 2010 +0000
+++ b/configure.ac	Fri Feb 12 13:24:25 2010 +0000
@@ -432,12 +432,39 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   FIND_TOOL([LLVM_CONFIG], [llvm-config])
   llvm_components="jit engine nativecodegen"
-  LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \
-    sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
-    sed -e 's/-pedantic//g' | sed -e 's/-D_DEBUG//g'`
+  dnl LLVM_CFLAGS
+  LLVM_CFLAGS=
+  for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
+    if echo "$flag" | grep -q '^-[[ID]]'; then
+      if test "$flag" != "-D_DEBUG"; then
+        if test "x$LLVM_CFLAGS" != "x"; then
+          LLVM_CFLAGS="$LLVM_CFLAGS "
+        fi
+        LLVM_CFLAGS="$LLVM_CFLAGS$flag"
+      fi
+    fi
+  done
+  dnl LLVM_LDFLAGS
+  LLVM_LDFLAGS=
+  for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
+    if echo "$flag" | grep -q '^-L'; then
+      if test "x$LLVM_LDFLAGS" != "x"; then
+        LLVM_LDFLAGS="$LLVM_LDFLAGS "
+      fi
+      LLVM_LDFLAGS="$LLVM_LDFLAGS$flag"
+    fi
+  done
+  dnl LLVM_LIBS
+  LLVM_LIBS=
+  for flag in $($LLVM_CONFIG --libs $llvm_components); do
+    if echo "$flag" | grep -q '^-l'; then
+      if test "x$LLVM_LIBS" != "x"; then
+        LLVM_LIBS="$LLVM_LIBS "
+      fi
+      LLVM_LIBS="$LLVM_LIBS$flag"
+    fi
+  done
   LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
-  LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
-  LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
 fi
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)


From gbenson at redhat.com  Fri Feb 12 05:30:08 2010
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 12 Feb 2010 13:30:08 +0000
Subject: Strip stupid LLVM options
Message-ID: <20100212133008.GC724@redhat.com>

Hi all,

Unlike other *-config scripts, llvm-config does not restrict itself to
include paths and libraries to link.  Instead, it passes all kinds of
options that mess up the HotSpot build: -O3, -Wall, -pedantic, etc.
Previously we have stripped out the worst offenders, but things keep
slipping through.  This patch changes to a whitelist approach, so only
the options we explicitly allow get through.

Cheers,
Gary

-- 
http://gbenson.net/
-------------- next part --------------
diff -r 748156804502 -r fc600c234771 ChangeLog
--- a/ChangeLog	Tue Feb 09 09:15:27 2010 +0000
+++ b/ChangeLog	Fri Feb 12 13:24:25 2010 +0000
@@ -1,3 +1,7 @@
+2010-02-12  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Strip stupid options that llvm-config supplies.
+
 2010-02-09  Edward Nevill <ed at camswl.com>
 
 	* cppInterpreter_arm.S / thumb2.cpp
diff -r 748156804502 -r fc600c234771 configure.ac
--- a/configure.ac	Tue Feb 09 09:15:27 2010 +0000
+++ b/configure.ac	Fri Feb 12 13:24:25 2010 +0000
@@ -432,12 +432,39 @@
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   FIND_TOOL([LLVM_CONFIG], [llvm-config])
   llvm_components="jit engine nativecodegen"
-  LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \
-    sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
-    sed -e 's/-pedantic//g' | sed -e 's/-D_DEBUG//g'`
+  dnl LLVM_CFLAGS
+  LLVM_CFLAGS=
+  for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
+    if echo "$flag" | grep -q '^-[[ID]]'; then
+      if test "$flag" != "-D_DEBUG"; then
+        if test "x$LLVM_CFLAGS" != "x"; then
+          LLVM_CFLAGS="$LLVM_CFLAGS "
+        fi
+        LLVM_CFLAGS="$LLVM_CFLAGS$flag"
+      fi
+    fi
+  done
+  dnl LLVM_LDFLAGS
+  LLVM_LDFLAGS=
+  for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
+    if echo "$flag" | grep -q '^-L'; then
+      if test "x$LLVM_LDFLAGS" != "x"; then
+        LLVM_LDFLAGS="$LLVM_LDFLAGS "
+      fi
+      LLVM_LDFLAGS="$LLVM_LDFLAGS$flag"
+    fi
+  done
+  dnl LLVM_LIBS
+  LLVM_LIBS=
+  for flag in $($LLVM_CONFIG --libs $llvm_components); do
+    if echo "$flag" | grep -q '^-l'; then
+      if test "x$LLVM_LIBS" != "x"; then
+        LLVM_LIBS="$LLVM_LIBS "
+      fi
+      LLVM_LIBS="$LLVM_LIBS$flag"
+    fi
+  done
   LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
-  LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
-  LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
 fi
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)

From bugzilla-daemon at icedtea.classpath.org  Sat Feb 13 06:48:36 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 13 Feb 2010 14:48:36 +0000
Subject: [Bug 179] javascript script support through rhino should not be on
	bootclasspath
Message-ID: <E1NgJIS-0008KN-Og@icedtea.classpath.org>

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





------- Comment #8 from mark at klomp.org  2010-02-13 14:48 -------
(In reply to comment #7)
> Instead of just symlinking the system Rhino JAR, we need to create a copy with
> the alternate namespace of com.sun.org.mozilla.   That means rewriting the
> class files so we need to look for an appropriate solution for doing this.

It would be better to load it through a separate class loader (not the
extension class loader, which is used now because the symlink is in the ext lib
path) so you don't need to make any copies and it never is seen on the source
compiler/bootstrap path. Having the ScriptEngine added to rhino itself as
suggested in comment #2 would make that easy.

The trouble with creating a copy and rejiggering all the package names is that
you will have a separate copy that you will need to keep in sync with the
distro supplied one some way. Double the effort on security and bug fixes.


-- 
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 Feb 13 07:57:58 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sat, 13 Feb 2010 15:57:58 +0000
Subject: [Bug 378] Gecko Browsers crashes due to IcedTeaPluginFactory
Message-ID: <E1NgKNa-0008M3-6N@icedtea.classpath.org>

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





------- Comment #2 from zephod at cfl.rr.com  2010-02-13 15:57 -------
Why has the severity been downgraded? The browswer still crashes with this 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 Feb 14 09:09:24 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 14 Feb 2010 17:09:24 +0000
Subject: [Bug 443] New: Iceweasel freezes and is unresponsive
Message-ID: <E1NghyG-0000wA-P4@icedtea.classpath.org>

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

           Summary: Iceweasel freezes and is unresponsive
           Product: IcedTea
           Version: unspecified
          Platform: x86
               URL: https://panopticlick.eff.org/
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: IcedTea6
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: debianuser at mll.dissimulo.com


When the test is run on the web site, Iceweasel with the IcedTea plugin,
freezes and is unreposive for some time and then an error message is shown

Script: https://panopticlick.eff.org/resources/fetch_whorls.js:96

Icecat browser crashes completely with the same plugin and web site test.

Iceweasel 3.5.6 Debian 5.0 and Icecat 3.6 effected browsers


-- 
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 icedtea.classpath.org  Mon Feb 15 03:41:11 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Mon, 15 Feb 2010 11:41:11 +0000
Subject: /hg/icedtea6: Synchronize Zero with upstream
Message-ID: <hg.c4148e0a2984.1266234071.2873452341184383832@icedtea.classpath.org>

changeset c4148e0a2984 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c4148e0a2984
author: Gary Benson <gbenson at redhat.com>
date: Mon Feb 15 11:41:03 2010 +0000

	Synchronize Zero with upstream


diffstat:

4 files changed, 45 insertions(+), 11 deletions(-)
ChangeLog                                                |   11 ++++
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp    |   31 +++++++++++---
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp    |    6 ++
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |    8 +--

diffs (131 lines):

diff -r fc600c234771 -r c4148e0a2984 ChangeLog
--- a/ChangeLog	Fri Feb 12 13:24:25 2010 +0000
+++ b/ChangeLog	Mon Feb 15 11:41:03 2010 +0000
@@ -1,3 +1,14 @@ 2010-02-12  Gary Benson  <gbenson at redhat
+2010-02-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
+	(CppInterpreter::result_type_of): New method.
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::result_type_of): Likewise.
+	(CppInterpreter::main_loop): Use the above.
+	(CppInterpreter::native_entry): Likewise.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(os::is_allocatable): s/AMD64/_LP64/.
+
 2010-02-12  Gary Benson  <gbenson at redhat.com>
 
 	* configure.ac: Strip stupid options that llvm-config supplies.
diff -r fc600c234771 -r c4148e0a2984 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Fri Feb 12 13:24:25 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Mon Feb 15 11:41:03 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,7 +145,7 @@ void CppInterpreter::main_loop(int recur
     }
     else if (istate->msg() == BytecodeInterpreter::return_from_method) {
       // Copy the result into the caller's frame
-      result_slots = type2size[method->result_type()];
+      result_slots = type2size[result_type_of(method)];
       assert(result_slots >= 0 && result_slots <= 2, "what?");
       result = istate->stack() + result_slots;
       break;
@@ -394,9 +394,10 @@ void CppInterpreter::native_entry(method
 
   // Push our result
   if (!HAS_PENDING_EXCEPTION) {
-    stack->set_sp(stack->sp() - type2size[method->result_type()]);
-
-    switch (method->result_type()) {
+    BasicType type = result_type_of(method);
+    stack->set_sp(stack->sp() - type2size[type]);
+
+    switch (type) {
     case T_VOID:
       break;
 
@@ -705,6 +706,26 @@ int AbstractInterpreter::BasicType_as_in
   assert(0 <= i && i < AbstractInterpreter::number_of_result_handlers,
          "index out of bounds");
   return i;
+}
+
+BasicType CppInterpreter::result_type_of(methodOop method) {
+  BasicType t;
+  switch (method->result_index()) {
+    case 0 : t = T_BOOLEAN; break;
+    case 1 : t = T_CHAR;    break;
+    case 2 : t = T_BYTE;    break;
+    case 3 : t = T_SHORT;   break;
+    case 4 : t = T_INT;     break;
+    case 5 : t = T_LONG;    break;
+    case 6 : t = T_VOID;    break;
+    case 7 : t = T_FLOAT;   break;
+    case 8 : t = T_DOUBLE;  break;
+    case 9 : t = T_OBJECT;  break;
+    default: ShouldNotReachHere();
+  }
+  assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
+         "out of step with AbstractInterpreter::BasicType_as_index");
+  return t;
 }
 
 address InterpreterGenerator::generate_empty_entry() {
diff -r fc600c234771 -r c4148e0a2984 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp	Fri Feb 12 13:24:25 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp	Mon Feb 15 11:41:03 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,3 +41,7 @@
  private:
   // Stack overflow checks
   static bool stack_overflow_imminent(JavaThread *thread);
+
+ private:
+  // Fast result type determination
+  static BasicType result_type_of(methodOop method);
diff -r fc600c234771 -r c4148e0a2984 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	Fri Feb 12 13:24:25 2010 +0000
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Mon Feb 15 11:41:03 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -249,11 +249,9 @@ void os::Linux::set_fpu_control_word(int
 }
 
 bool os::is_allocatable(size_t bytes) {
-#ifdef AMD64
-  // unused on amd64?
+#ifdef _LP64
   return true;
 #else
-
   if (bytes < 2 * G) {
     return true;
   }
@@ -265,7 +263,7 @@ bool os::is_allocatable(size_t bytes) {
   }
 
   return addr != NULL;
-#endif // AMD64
+#endif // _LP64
 }
 
 ///////////////////////////////////////////////////////////////////////////////


From andrew at icedtea.classpath.org  Mon Feb 15 09:25:43 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 15 Feb 2010 17:25:43 +0000
Subject: /hg/icedtea6: Add class file rewriter which will be used to solv...
Message-ID: <hg.d9b5a2ba9523.1266254743.2873452341184383832@icedtea.classpath.org>

changeset d9b5a2ba9523 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d9b5a2ba9523
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 17:25:12 2010 +0000

	Add class file rewriter which will be used to solve the Rhino issue:
	http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179 once
	hooked into the build.

	2010-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * rewriter/agpl-3.0.txt,
		* rewriter/com/redhat/rewriter/ClassRewriter.java: Add class
	rewriter for fixing Rhino classes to use the
	com.sun.org.mozilla namespace, along with corresponding
	license.


diffstat:

3 files changed, 936 insertions(+)
ChangeLog                                       |    8 
rewriter/agpl-3.0.txt                           |  661 +++++++++++++++++++++++
rewriter/com/redhat/rewriter/ClassRewriter.java |  267 +++++++++

diffs (truncated from 952 to 500 lines):

diff -r c4148e0a2984 -r d9b5a2ba9523 ChangeLog
--- a/ChangeLog	Mon Feb 15 11:41:03 2010 +0000
+++ b/ChangeLog	Mon Feb 15 17:25:12 2010 +0000
@@ -1,3 +1,11 @@ 2010-02-15  Gary Benson  <gbenson at redhat
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* rewriter/agpl-3.0.txt,
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	Add class rewriter for fixing Rhino classes
+	to use the com.sun.org.mozilla namespace,
+	along with corresponding license.
+
 2010-02-15  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
diff -r c4148e0a2984 -r d9b5a2ba9523 rewriter/agpl-3.0.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rewriter/agpl-3.0.txt	Mon Feb 15 17:25:12 2010 +0000
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent


From andrew at icedtea.classpath.org  Mon Feb 15 14:02:41 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Mon, 15 Feb 2010 22:02:41 +0000
Subject: /hg/icedtea6: Make clear that patches are from OpenJDK and use c...
Message-ID: <hg.73755cc5f4cb.1266271361.2873452341184383832@icedtea.classpath.org>

changeset 73755cc5f4cb in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=73755cc5f4cb
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 21:59:48 2010 +0000

	Make clear that patches are from OpenJDK and use correct bug IDs.

	2010-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-6829636-loggingdeadlock2.patch,
		* patches/icedtea-6912628-turkcert.patch,
		* patches/icedtea-6920143-using-with-mouse.patch,
		* patches/icedtea-6920172-location-relative-to-test.patch,
		* patches/icedtea-6920172-turkish.patch: Moved.
		* Makefile.am: Use new patch paths.
		* patches/openjdk/6716076-loggingdeadlock2.patch,
		* patches/openjdk/6912628-turkcert.patch,
		* patches/openjdk/6917663-turkish.patch,
		* patches/openjdk/6920143-using-with-mouse.patch,
		* patches/openjdk/6920172-location-relative-to-test.patch:
	Move OpenJDK patches to appropriate directory and use
	correct bug IDs for loggingdeadlock2 and turkish.


diffstat:

12 files changed, 371 insertions(+), 354 deletions(-)
ChangeLog                                               |   17 +
Makefile.am                                             |   10 
patches/icedtea-6829636-loggingdeadlock2.patch          |  249 ---------------
patches/icedtea-6912628-turkcert.patch                  |   14 
patches/icedtea-6920143-using-with-mouse.patch          |   45 --
patches/icedtea-6920172-location-relative-to-test.patch |   27 -
patches/icedtea-6920172-turkish.patch                   |   14 
patches/openjdk/6716076-loggingdeadlock2.patch          |  249 +++++++++++++++
patches/openjdk/6912628-turkcert.patch                  |   14 
patches/openjdk/6917663-turkish.patch                   |   14 
patches/openjdk/6920143-using-with-mouse.patch          |   45 ++
patches/openjdk/6920172-location-relative-to-test.patch |   27 +

diffs (truncated from 782 to 500 lines):

diff -r d9b5a2ba9523 -r 73755cc5f4cb ChangeLog
--- a/ChangeLog	Mon Feb 15 17:25:12 2010 +0000
+++ b/ChangeLog	Mon Feb 15 21:59:48 2010 +0000
@@ -1,3 +1,20 @@ 2010-02-15 Andrew John Hughes  <ahughes@
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-6829636-loggingdeadlock2.patch,
+	* patches/icedtea-6912628-turkcert.patch,
+	* patches/icedtea-6920143-using-with-mouse.patch,
+	* patches/icedtea-6920172-location-relative-to-test.patch,
+	* patches/icedtea-6920172-turkish.patch:
+	Moved.
+	* Makefile.am: Use new patch paths.
+	* patches/openjdk/6716076-loggingdeadlock2.patch,
+	* patches/openjdk/6912628-turkcert.patch,
+	* patches/openjdk/6917663-turkish.patch,
+	* patches/openjdk/6920143-using-with-mouse.patch,
+	* patches/openjdk/6920172-location-relative-to-test.patch:
+	Move OpenJDK patches to appropriate directory and use
+	correct bug IDs for loggingdeadlock2 and turkish.
+
 2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
 
 	* rewriter/agpl-3.0.txt,
diff -r d9b5a2ba9523 -r 73755cc5f4cb Makefile.am
--- a/Makefile.am	Mon Feb 15 17:25:12 2010 +0000
+++ b/Makefile.am	Mon Feb 15 21:59:48 2010 +0000
@@ -310,11 +310,11 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-parisc.patch \
 	patches/icedtea-sh4-support.patch \
 	patches/libpng.patch \
-	patches/icedtea-6920143-using-with-mouse.patch \
-        patches/icedtea-6920172-location-relative-to-test.patch \
-        patches/icedtea-6920172-turkish.patch \
-        patches/icedtea-6912628-turkcert.patch \
-        patches/icedtea-6829636-loggingdeadlock2.patch
+	patches/openjdk/6920143-using-with-mouse.patch \
+        patches/openjdk/6920172-location-relative-to-test.patch \
+        patches/openjdk/6917663-turkish.patch \
+        patches/openjdk/6912628-turkcert.patch \
+        patches/openjdk/6716076-loggingdeadlock2.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r d9b5a2ba9523 -r 73755cc5f4cb patches/icedtea-6829636-loggingdeadlock2.patch
--- a/patches/icedtea-6829636-loggingdeadlock2.patch	Mon Feb 15 17:25:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
-Fixes created by mchung and martin
-
---- openjdk.orig/jdk/test/java/util/logging/LoggingDeadlock2.java	Fri Jan 30 16:27:33 2009 -0800
-+++ openjdk/jdk/test/java/util/logging/LoggingDeadlock2.java	Fri Dec 04 23:11:11 2009 +0000
-@@ -23,10 +23,10 @@
- 
- /*
-  * @test
-- * @bug     6467152
-+ * @bug     6467152 6716076 6829503
-  *
-  * @summary deadlock occurs in LogManager initialization and JVM termination
-- * @author  Serguei Spitsyn / Hittachi
-+ * @author  Serguei Spitsyn / Hittachi / Martin Buchholz
-  *
-  * @build    LoggingDeadlock2
-  * @run  main/timeout=15 LoggingDeadlock2
-@@ -47,43 +47,195 @@
-  * This is a regression test for this bug.
-  */
- 
-+import java.util.Arrays;
-+import java.util.List;
-+import java.util.Random;
-+import java.util.concurrent.CyclicBarrier;
-+import java.util.concurrent.atomic.AtomicInteger;
- import java.util.logging.LogManager;
--
--public class LoggingDeadlock2 implements Runnable {
--    static final java.io.PrintStream out = System.out;
--    static Object lock = new Object();
--    static int c = 0;
--    public static void main(String arg[]) {
--        out.println("\nThis test checks that there is no deadlock.");
--        out.println("If not crashed or timed-out then it is passed.");
-+import java.io.File;
-+import java.io.InputStream;
-+import java.io.InputStreamReader;
-+import java.io.Reader;
-+
-+public class LoggingDeadlock2 {
-+
-+    public static void realMain(String arg[]) throws Throwable {
-         try {
--            new Thread(new LoggingDeadlock2()).start();
--            synchronized(lock) {
--                c++;
--                if (c == 2) lock.notify();
--                else lock.wait();
-+            System.out.println(javaChildArgs);
-+            ProcessBuilder pb = new ProcessBuilder(javaChildArgs);
-+            ProcessResults r = run(pb.start());
-+            equal(r.exitValue(), 99);
-+            equal(r.out(), "");
-+            equal(r.err(), "");
-+        } catch (Throwable t) { unexpected(t); }
-+    }
-+
-+    public static class JavaChild {
-+        public static void main(String args[]) throws Throwable {
-+            final CyclicBarrier startingGate = new CyclicBarrier(2);
-+            final Throwable[] thrown = new Throwable[1];
-+
-+            // Some random variation, to help tickle races.
-+            final Random rnd = new Random();
-+            final boolean dojoin = rnd.nextBoolean();
-+            final int JITTER = 1024;
-+            final int iters1 = rnd.nextInt(JITTER);
-+            final int iters2 = JITTER - iters1;
-+            final AtomicInteger counter = new AtomicInteger(0);
-+
-+            Thread exiter = new Thread() {
-+                public void run() {
-+                    try {
-+                        startingGate.await();
-+                        for (int i = 0; i < iters1; i++)
-+                            counter.getAndIncrement();
-+                        System.exit(99);
-+                    } catch (Throwable t) {
-+                        t.printStackTrace();
-+                        System.exit(86);
-+                    }
-+                }};
-+            exiter.start();
-+
-+            startingGate.await();
-+            for (int i = 0; i < iters2; i++)
-+                counter.getAndIncrement();
-+            // This may or may not result in a first call to
-+            // Runtime.addShutdownHook after shutdown has already
-+            // commenced.
-+            LogManager log = LogManager.getLogManager();
-+
-+            if (dojoin) {
-+                exiter.join();
-+                if (thrown[0] != null)
-+                    throw new Error(thrown[0]);
-+                check(counter.get() == JITTER);
-             }
--            LogManager log = LogManager.getLogManager();
--            out.println("Test passed");
--        }
--        catch(Exception e) {
--            e.printStackTrace();
--            out.println("Test FAILED"); // Not expected
--        }
--    }
--
--    public void run() {
-+        }
-+    }
-+
-+    //----------------------------------------------------------------
-+    // The rest of this test is copied from ProcessBuilder/Basic.java
-+    //----------------------------------------------------------------
-+    private static final String javaExe =
-+        System.getProperty("java.home") +
-+        File.separator + "bin" + File.separator + "java";
-+
-+    private static final String classpath =
-+        System.getProperty("java.class.path");
-+
-+    private static final List<String> javaChildArgs =
-+        Arrays.asList(new String[]
-+            { javaExe, "-classpath", classpath,
-+              "LoggingDeadlock2$JavaChild"});
-+
-+    private static class ProcessResults {
-+        private final String out;
-+        private final String err;
-+        private final int exitValue;
-+        private final Throwable throwable;
-+
-+        public ProcessResults(String out,
-+                              String err,
-+                              int exitValue,
-+                              Throwable throwable) {
-+            this.out = out;
-+            this.err = err;
-+            this.exitValue = exitValue;
-+            this.throwable = throwable;
-+        }
-+
-+        public String out()          { return out; }
-+        public String err()          { return err; }
-+        public int exitValue()       { return exitValue; }
-+        public Throwable throwable() { return throwable; }
-+
-+        public String toString() {
-+            StringBuilder sb = new StringBuilder();
-+            sb.append("<STDOUT>\n" + out() + "</STDOUT>\n")
-+                .append("<STDERR>\n" + err() + "</STDERR>\n")
-+                .append("exitValue = " + exitValue + "\n");
-+            if (throwable != null)
-+                sb.append(throwable.getStackTrace());
-+            return sb.toString();
-+        }
-+    }
-+
-+    private static class StreamAccumulator extends Thread {
-+        private final InputStream is;
-+        private final StringBuilder sb = new StringBuilder();
-+        private Throwable throwable = null;
-+
-+        public String result () throws Throwable {
-+            if (throwable != null)
-+                throw throwable;
-+            return sb.toString();
-+        }
-+
-+        StreamAccumulator (InputStream is) {
-+            this.is = is;
-+        }
-+
-+        public void run() {
-+            try {
-+                Reader r = new InputStreamReader(is);
-+                char[] buf = new char[4096];
-+                int n;
-+                while ((n = r.read(buf)) > 0) {
-+                    sb.append(buf,0,n);
-+                }
-+            } catch (Throwable t) {
-+                throwable = t;
-+            } finally {
-+                try { is.close(); }
-+                catch (Throwable t) { throwable = t; }
-+            }
-+        }
-+    }
-+
-+    private static ProcessResults run(Process p) {
-+        Throwable throwable = null;
-+        int exitValue = -1;
-+        String out = "";
-+        String err = "";
-+
-+        StreamAccumulator outAccumulator =
-+            new StreamAccumulator(p.getInputStream());
-+        StreamAccumulator errAccumulator =
-+            new StreamAccumulator(p.getErrorStream());
-+
-         try {
--            synchronized(lock) {
--                c++;
--                if (c == 2) lock.notify();
--                else lock.wait();
--            }
--            System.exit(1);
--        }
--        catch(Exception e) {
--            e.printStackTrace();
--            out.println("Test FAILED"); // Not expected
--        }
--    }
-+            outAccumulator.start();
-+            errAccumulator.start();
-+
-+            exitValue = p.waitFor();
-+
-+            outAccumulator.join();
-+            errAccumulator.join();
-+
-+            out = outAccumulator.result();
-+            err = errAccumulator.result();
-+        } catch (Throwable t) {
-+            throwable = t;
-+        }
-+
-+        return new ProcessResults(out, err, exitValue, throwable);
-+    }
-+
-+    //--------------------- Infrastructure ---------------------------
-+    static volatile int passed = 0, failed = 0;
-+    static void pass() {passed++;}
-+    static void fail() {failed++; Thread.dumpStack();}
-+    static void fail(String msg) {System.out.println(msg); fail();}
-+    static void unexpected(Throwable t) {failed++; t.printStackTrace();}
-+    static void check(boolean cond) {if (cond) pass(); else fail();}
-+    static void check(boolean cond, String m) {if (cond) pass(); else fail(m);}
-+    static void equal(Object x, Object y) {
-+        if (x == null ? y == null : x.equals(y)) pass();
-+        else fail(x + " not equal to " + y);}
-+    public static void main(String[] args) throws Throwable {
-+        try {realMain(args);} catch (Throwable t) {unexpected(t);}
-+        System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
-+        if (failed > 0) throw new AssertionError("Some tests failed");}
- }
diff -r d9b5a2ba9523 -r 73755cc5f4cb patches/icedtea-6912628-turkcert.patch
--- a/patches/icedtea-6912628-turkcert.patch	Mon Feb 15 17:25:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-6912628: test/java/util/jar/JarFile/TurkCert.java cannot be run in samevm mode
-Summary: Added tag to run this test in othervm
-Reviewed-by: chegar
-
---- openjdk.orig/jdk/test/java/util/jar/JarFile/TurkCert.java	2010-02-02 12:02:47.216585000 +0100
-+++ openjdk/jdk/test/java/util/jar/JarFile/TurkCert.java	2010-02-02 12:02:46.933586000 +0100
-@@ -26,6 +26,7 @@
-  * @bug 4624534
-  * @summary Make sure jar certificates work for Turkish locale
-  * @author kladko
-+ * @run main/othervm TurkCert
-  */
- 
- import java.util.*;
diff -r d9b5a2ba9523 -r 73755cc5f4cb patches/icedtea-6920143-using-with-mouse.patch
--- a/patches/icedtea-6920143-using-with-mouse.patch	Mon Feb 15 17:25:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync()
-Summary: Added small delay to make sure that TextArea animation have finished
-Reviewed-by: anthony
-
---- openjdk.orig/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java	2010-01-27 14:45:28.000000000 +0100
-+++ openjdk/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java	2010-01-27 14:45:27.000000000 +0100
-@@ -56,6 +56,7 @@
-     TextArea textArea;
-     Robot robot;
-     final int desiredSelectionEnd = ('z'-'a'+1)*2;  // 52
-+    final static int SCROLL_DELAY = 100; // ms
- 
-     public void start () {
-         createObjects();
-@@ -126,6 +127,8 @@
- 
-             moveMouseBelowTextArea( tremble%2!=0 );
-             Util.waitForIdle( robot );
-+            // it is needed to add some small delay on Gnome
-+            waitUntilScrollIsPerformed(robot);
-         }
- 
-         robot.mouseRelease( MouseEvent.BUTTON1_MASK );
-@@ -141,9 +144,19 @@
-     void moveMouseBelowTextArea( boolean shift ) {
-         Dimension d = textArea.getSize();
-         Point l = textArea.getLocationOnScreen();
-+        int x = (int)(l.x+d.width*.5);
-         int y = (int)(l.y+d.height*1.5);
-         if( shift ) y+=15;
--        robot.mouseMove( (int)(l.x+d.width*.5), y );
-+        robot.mouseMove( x, y );
-+    }
-+
-+    void waitUntilScrollIsPerformed(Robot robot) {
-+        try {
-+            Thread.sleep( SCROLL_DELAY );
-+        }
-+        catch( Exception e ) {
-+            throw new RuntimeException( e );
-+        }
-     }
- 
-     void checkResults() {
-
diff -r d9b5a2ba9523 -r 73755cc5f4cb patches/icedtea-6920172-location-relative-to-test.patch
--- a/patches/icedtea-6920172-location-relative-to-test.patch	Mon Feb 15 17:25:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-6920172: Regression test LocationRelativeToTest does not check frame position correctly.
-Summary: Testcase correction - check frame position against graphics environment's center point
-Reviewed-by: art
-
---- openjdk.orig/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java	2010-01-25 17:42:52.000000000 +0100
-+++ openjdk/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java	2010-01-25 17:42:52.000000000 +0100
-@@ -50,7 +50,8 @@
- 
-         GraphicsEnvironment ge =
-             GraphicsEnvironment.getLocalGraphicsEnvironment();
--        System.out.println("Center point: " + ge.getCenterPoint());
-+        Point centerPoint = ge.getCenterPoint();
-+        System.out.println("Center point: " + centerPoint);
-         GraphicsDevice[] gds = ge.getScreenDevices();
-         GraphicsDevice gdDef = ge.getDefaultScreenDevice();
-         GraphicsConfiguration gcDef =
-@@ -77,8 +78,7 @@
-             // second, check setLocationRelativeTo(invisible)
-             f.setLocationRelativeTo(f2);
-             Util.waitForIdle(r);
--            checkLocation(f, new Point(gcBounds.x + gcBounds.width / 2,
--                                       gcBounds.y + gcBounds.height / 2));
-+            checkLocation(f, centerPoint);
- 
-             // third, check setLocationRelativeTo(visible)
-             f2.setVisible(true);
-
diff -r d9b5a2ba9523 -r 73755cc5f4cb patches/icedtea-6920172-turkish.patch
--- a/patches/icedtea-6920172-turkish.patch	Mon Feb 15 17:25:12 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-6917663: test/java/security/Provider/Turkish.java not samevm friendly
-Summary: Added othervm flag to ensure that this test will run in isolation.
-Reviewed-by: alanb
-
---- openjdk.orig/jdk/test/java/security/Provider/Turkish.java        2010-01-18 11:02:18.000000000 +0100
-+++ openjdk/jdk/test/java/security/Provider/Turkish.java        2010-01-18 11:02:17.000000000 +0100
-@@ -25,6 +25,7 @@
-  * @test
-  * @bug 6220064
-  * @summary make sure everything works ok in the Turkish local (dotted/dotless i problem)
-+ * @run main/othervm Turkish
-  * @author Andreas Sterbenz
-  */
-
diff -r d9b5a2ba9523 -r 73755cc5f4cb patches/openjdk/6716076-loggingdeadlock2.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6716076-loggingdeadlock2.patch	Mon Feb 15 21:59:48 2010 +0000
@@ -0,0 +1,249 @@
+6829636: test/java/util/logging/LoggingDeadlock2.java is flaky
+Fixes created by mchung and martin
+
+--- openjdk.orig/jdk/test/java/util/logging/LoggingDeadlock2.java	Fri Jan 30 16:27:33 2009 -0800
++++ openjdk/jdk/test/java/util/logging/LoggingDeadlock2.java	Fri Dec 04 23:11:11 2009 +0000
+@@ -23,10 +23,10 @@
+ 
+ /*
+  * @test
+- * @bug     6467152
++ * @bug     6467152 6716076 6829503
+  *
+  * @summary deadlock occurs in LogManager initialization and JVM termination
+- * @author  Serguei Spitsyn / Hittachi
++ * @author  Serguei Spitsyn / Hittachi / Martin Buchholz
+  *
+  * @build    LoggingDeadlock2
+  * @run  main/timeout=15 LoggingDeadlock2
+@@ -47,43 +47,195 @@
+  * This is a regression test for this bug.
+  */
+ 
++import java.util.Arrays;
++import java.util.List;
++import java.util.Random;
++import java.util.concurrent.CyclicBarrier;
++import java.util.concurrent.atomic.AtomicInteger;
+ import java.util.logging.LogManager;
+-
+-public class LoggingDeadlock2 implements Runnable {
+-    static final java.io.PrintStream out = System.out;
+-    static Object lock = new Object();
+-    static int c = 0;
+-    public static void main(String arg[]) {
+-        out.println("\nThis test checks that there is no deadlock.");
+-        out.println("If not crashed or timed-out then it is passed.");
++import java.io.File;
++import java.io.InputStream;
++import java.io.InputStreamReader;
++import java.io.Reader;
++
++public class LoggingDeadlock2 {
++
++    public static void realMain(String arg[]) throws Throwable {
+         try {
+-            new Thread(new LoggingDeadlock2()).start();
+-            synchronized(lock) {
+-                c++;
+-                if (c == 2) lock.notify();
+-                else lock.wait();
++            System.out.println(javaChildArgs);
++            ProcessBuilder pb = new ProcessBuilder(javaChildArgs);
++            ProcessResults r = run(pb.start());
++            equal(r.exitValue(), 99);
++            equal(r.out(), "");
++            equal(r.err(), "");
++        } catch (Throwable t) { unexpected(t); }
++    }
++
++    public static class JavaChild {
++        public static void main(String args[]) throws Throwable {
++            final CyclicBarrier startingGate = new CyclicBarrier(2);
++            final Throwable[] thrown = new Throwable[1];
++
++            // Some random variation, to help tickle races.
++            final Random rnd = new Random();
++            final boolean dojoin = rnd.nextBoolean();
++            final int JITTER = 1024;
++            final int iters1 = rnd.nextInt(JITTER);
++            final int iters2 = JITTER - iters1;
++            final AtomicInteger counter = new AtomicInteger(0);
++
++            Thread exiter = new Thread() {
++                public void run() {
++                    try {
++                        startingGate.await();
++                        for (int i = 0; i < iters1; i++)
++                            counter.getAndIncrement();
++                        System.exit(99);
++                    } catch (Throwable t) {
++                        t.printStackTrace();
++                        System.exit(86);
++                    }


From gbenson at icedtea.classpath.org  Tue Feb 16 07:54:59 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Tue, 16 Feb 2010 15:54:59 +0000
Subject: /hg/icedtea6: Add s390 support to TCK setup helper script
Message-ID: <hg.8eb821cc2cd0.1266335698.2873452341184383832@icedtea.classpath.org>

changeset 8eb821cc2cd0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8eb821cc2cd0
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 16 15:54:50 2010 +0000

	Add s390 support to TCK setup helper script


diffstat:

2 files changed, 7 insertions(+)
ChangeLog                          |    4 ++++
contrib/jck/compile-native-code.sh |    3 +++

diffs (24 lines):

diff -r 73755cc5f4cb -r 8eb821cc2cd0 ChangeLog
--- a/ChangeLog	Mon Feb 15 21:59:48 2010 +0000
+++ b/ChangeLog	Tue Feb 16 15:54:50 2010 +0000
@@ -1,3 +1,7 @@ 2010-02-15 Andrew John Hughes  <ahughes@
+2010-02-16  Gary Benson  <gbenson at redhat.com>
+	
+	* contrib/jck/compile-native-code.sh: Add s390.
+
 2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-6829636-loggingdeadlock2.patch,
diff -r 73755cc5f4cb -r 8eb821cc2cd0 contrib/jck/compile-native-code.sh
--- a/contrib/jck/compile-native-code.sh	Mon Feb 15 21:59:48 2010 +0000
+++ b/contrib/jck/compile-native-code.sh	Tue Feb 16 15:54:50 2010 +0000
@@ -21,6 +21,9 @@ case "$arch" in
 case "$arch" in
   arm*)
     MFLAG=
+    ;;
+  s390)
+    MFLAG=-m31
     ;;
   i?86|ppc)
     MFLAG=-m32


From bugzilla-daemon at icedtea.classpath.org  Wed Feb 17 00:59:34 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 17 Feb 2010 08:59:34 +0000
Subject: [Bug 445] New: FMJstudio
Message-ID: <E1Nhfks-0004hk-2C@icedtea.classpath.org>

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

           Summary: FMJstudio
           Product: IcedTea
           Version: unspecified
          Platform: x86
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P1
         Component: AddVM
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: Maarten.Vandeperre at gmail.com


when I try to run Fmjstudio I get this error:


#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x00a1a87a, pid=3519, tid=117590896
#
# JRE version: 6.0-b16
# Java VM: OpenJDK Server VM (14.0-b16 mixed mode linux-x86 )
# Distribution: Custom build (Thu Nov 12 09:49:25 EST 2009)
# Problematic frame:
# C  [libc.so.6+0x6e87a]
#
# If you would like to submit a bug report, please include
# instructions how to reproduce the bug and visit:
#   http://icedtea.classpath.org/bugzilla
#

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

Current thread (0xb7798800):  JavaThread "AWT-EventQueue-0" [_thread_in_vm,
id=3539, stack(0x06fd4000,0x07025000)]

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

Registers:
EAX=0x0999a900, EBX=0x00b1cff4, ECX=0x0999a900, EDX=0x00b1e3b0
ESP=0x07022ce4, EBP=0x07022d18, ESI=0x00b1e3b0, EDI=0x0a4b8cb0
EIP=0x00a1a87a, CR2=0x0a4b8cb4, EFLAGS=0x00210206

Top of Stack: (sp=0x07022ce4)
0x07022ce4:   00000000 01361808 00ae4784 00b1e3ac
0x07022cf4:   013827f4 00b1e394 00b1e380 09c8f388
0x07022d04:   00b1e3b0 00007ff8 00b1cff4 00b1e380
0x07022d14:   00001000 07022da8 00a1d4ad 00000000
0x07022d24:   00000000 01361808 90ccddf0 00000000
0x07022d34:   00000000 01361808 013827f4 8f61003c
0x07022d44:   b7798800 07022da8 012a69dc 8f61003c
0x07022d54:   90ccde08 0000000c 0000000f 8f61003c 

Instructions: (pc=0x00a1a87a)
0x00a1a86a:   46 08 89 45 e8 8b 46 04 89 c1 83 e1 fa 8d 3c 0e
0x00a1a87a:   8b 57 04 83 e2 f8 a8 01 89 55 f0 75 3b 8b 06 29 

Stack: [0x06fd4000,0x07025000],  sp=0x07022ce4,  free space=315k
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
C  [libc.so.6+0x6e87a]
C  [libc.so.6+0x714ad]
C  [libc.so.6+0x7275e]  __libc_malloc+0x5e
V  [libjvm.so+0x499a78]
V  [libjvm.so+0x2eebef]
V  [libjvm.so+0x2eec78]
V  [libjvm.so+0x548860]
V  [libjvm.so+0x548931]
V  [libjvm.so+0x549412]
V  [libjvm.so+0x335ba8]
V  [libjvm.so+0x335d2e]
V  [libjvm.so+0x374324]
C  [libjava.so+0xfc8b]  Java_java_lang_Throwable_getStackTraceElement+0x2b
j  java.lang.Throwable.getStackTraceElement(I)Ljava/lang/StackTraceElement;+0
j  java.lang.Throwable.getOurStackTrace()[Ljava/lang/StackTraceElement;+34
j  java.lang.Throwable.printStackTrace(Ljava/io/PrintWriter;)V+10
j 
net.sf.fmj.utility.FmjLoggingFormatter.format(Ljava/util/logging/LogRecord;)Ljava/lang/String;+112
j  java.util.logging.StreamHandler.publish(Ljava/util/logging/LogRecord;)V+14
j  java.util.logging.ConsoleHandler.publish(Ljava/util/logging/LogRecord;)V+2
j  java.util.logging.Logger.log(Ljava/util/logging/LogRecord;)V+92
j  java.util.logging.Logger.doLog(Ljava/util/logging/LogRecord;)V+33
j 
java.util.logging.Logger.log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V+42
j  net.sf.fmj.media.protocol.civil.DataSource.connect()V+248
j 
javax.media.Manager.createPlayer(Ljavax/media/MediaLocator;)Ljavax/media/Player;+55
j 
net.sf.fmj.ui.application.ContainerPlayer.createNewPlayer(Ljavax/media/MediaLocator;)V+94
j 
net.sf.fmj.ui.application.ContainerPlayer.setMediaLocation(Ljava/lang/String;Z)V+94
j  net.sf.fmj.ui.application.PlayerPanel.onLoadButtonClick()V+54
j 
net.sf.fmj.ui.application.PlayerPanel.access$100(Lnet/sf/fmj/ui/application/PlayerPanel;)V+1
j 
net.sf.fmj.ui.application.PlayerPanel$1.itemStateChanged(Ljava/awt/event/ItemEvent;)V+37
j  javax.swing.JComboBox.fireItemStateChanged(Ljava/awt/event/ItemEvent;)V+35
j  javax.swing.JComboBox.selectedItemChanged()V+64
j  javax.swing.JComboBox.contentsChanged(Ljavax/swing/event/ListDataEvent;)V+28
j  javax.swing.AbstractListModel.fireContentsChanged(Ljava/lang/Object;II)V+65
j  javax.swing.DefaultComboBoxModel.setSelectedItem(Ljava/lang/Object;)V+38
j  javax.swing.JComboBox.setSelectedItem(Ljava/lang/Object;)V+103
j 
net.sf.fmj.ui.application.PlayerPanel.addMediaLocatorAndLoad(Ljava/lang/String;)V+82
j  net.sf.fmj.ui.application.PlayerPanel.onOpenCaptureDevice()V+17
j 
net.sf.fmj.ui.application.PlayerPanel$5.actionPerformed(Ljava/awt/event/ActionEvent;)V+4
j 
javax.swing.AbstractButton.fireActionPerformed(Ljava/awt/event/ActionEvent;)V+84
j 
javax.swing.AbstractButton$Handler.actionPerformed(Ljava/awt/event/ActionEvent;)V+5
j 
javax.swing.DefaultButtonModel.fireActionPerformed(Ljava/awt/event/ActionEvent;)V+35
j  javax.swing.DefaultButtonModel.setPressed(Z)V+117
j 
javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Ljava/awt/event/MouseEvent;)V+35
j  java.awt.AWTEventMulticaster.mouseReleased(Ljava/awt/event/MouseEvent;)V+8
j  java.awt.Component.processMouseEvent(Ljava/awt/event/MouseEvent;)V+64
j  javax.swing.JComponent.processMouseEvent(Ljava/awt/event/MouseEvent;)V+23
j  java.awt.Component.processEvent(Ljava/awt/AWTEvent;)V+81
j  java.awt.Container.processEvent(Ljava/awt/AWTEvent;)V+18
j  java.awt.Component.dispatchEventImpl(Ljava/awt/AWTEvent;)V+589
j  java.awt.Container.dispatchEventImpl(Ljava/awt/AWTEvent;)V+42
j  java.awt.Component.dispatchEvent(Ljava/awt/AWTEvent;)V+2
j 
java.awt.LightweightDispatcher.retargetMouseEvent(Ljava/awt/Component;ILjava/awt/event/MouseEvent;)V+320
j 
java.awt.LightweightDispatcher.processMouseEvent(Ljava/awt/event/MouseEvent;)Z+139
j  java.awt.LightweightDispatcher.dispatchEvent(Ljava/awt/AWTEvent;)Z+50
j  java.awt.Container.dispatchEventImpl(Ljava/awt/AWTEvent;)V+12
j  java.awt.Window.dispatchEventImpl(Ljava/awt/AWTEvent;)V+19
j  java.awt.Component.dispatchEvent(Ljava/awt/AWTEvent;)V+2
j  java.awt.EventQueue.dispatchEvent(Ljava/awt/AWTEvent;)V+46
j  java.awt.EventDispatchThread.pumpOneEventForFilters(I)Z+192
j 
java.awt.EventDispatchThread.pumpEventsForFilter(ILjava/awt/Conditional;Ljava/awt/EventFilter;)V+30
j 
java.awt.EventDispatchThread.pumpEventsForHierarchy(ILjava/awt/Conditional;Ljava/awt/Component;)V+11
j  java.awt.EventDispatchThread.pumpEvents(ILjava/awt/Conditional;)V+4
j  java.awt.EventDispatchThread.pumpEvents(Ljava/awt/Conditional;)V+3
j  java.awt.EventDispatchThread.run()V+9
v  ~StubRoutines::call_stub
V  [libjvm.so+0x32f505]
V  [libjvm.so+0x49b569]
V  [libjvm.so+0x32e3ff]
V  [libjvm.so+0x32e8da]
V  [libjvm.so+0x32ea6a]
V  [libjvm.so+0x37efe2]
V  [libjvm.so+0x57d350]
V  [libjvm.so+0x57d4c3]
V  [libjvm.so+0x4a1531]
C  [libpthread.so.0+0x5ab5]

Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
j  java.lang.Throwable.getStackTraceElement(I)Ljava/lang/StackTraceElement;+0
j  java.lang.Throwable.getOurStackTrace()[Ljava/lang/StackTraceElement;+34
j  java.lang.Throwable.printStackTrace(Ljava/io/PrintWriter;)V+10
j 
net.sf.fmj.utility.FmjLoggingFormatter.format(Ljava/util/logging/LogRecord;)Ljava/lang/String;+112
j  java.util.logging.StreamHandler.publish(Ljava/util/logging/LogRecord;)V+14
j  java.util.logging.ConsoleHandler.publish(Ljava/util/logging/LogRecord;)V+2
j  java.util.logging.Logger.log(Ljava/util/logging/LogRecord;)V+92
j  java.util.logging.Logger.doLog(Ljava/util/logging/LogRecord;)V+33
j 
java.util.logging.Logger.log(Ljava/util/logging/Level;Ljava/lang/String;Ljava/lang/Throwable;)V+42
j  net.sf.fmj.media.protocol.civil.DataSource.connect()V+248
j 
javax.media.Manager.createPlayer(Ljavax/media/MediaLocator;)Ljavax/media/Player;+55
j 
net.sf.fmj.ui.application.ContainerPlayer.createNewPlayer(Ljavax/media/MediaLocator;)V+94
j 
net.sf.fmj.ui.application.ContainerPlayer.setMediaLocation(Ljava/lang/String;Z)V+94
j  net.sf.fmj.ui.application.PlayerPanel.onLoadButtonClick()V+54
j 
net.sf.fmj.ui.application.PlayerPanel.access$100(Lnet/sf/fmj/ui/application/PlayerPanel;)V+1
j 
net.sf.fmj.ui.application.PlayerPanel$1.itemStateChanged(Ljava/awt/event/ItemEvent;)V+37
j  javax.swing.JComboBox.fireItemStateChanged(Ljava/awt/event/ItemEvent;)V+35
j  javax.swing.JComboBox.selectedItemChanged()V+64
j  javax.swing.JComboBox.contentsChanged(Ljavax/swing/event/ListDataEvent;)V+28
j  javax.swing.AbstractListModel.fireContentsChanged(Ljava/lang/Object;II)V+65
j  javax.swing.DefaultComboBoxModel.setSelectedItem(Ljava/lang/Object;)V+38
j  javax.swing.JComboBox.setSelectedItem(Ljava/lang/Object;)V+103
j 
net.sf.fmj.ui.application.PlayerPanel.addMediaLocatorAndLoad(Ljava/lang/String;)V+82
j  net.sf.fmj.ui.application.PlayerPanel.onOpenCaptureDevice()V+17
j 
net.sf.fmj.ui.application.PlayerPanel$5.actionPerformed(Ljava/awt/event/ActionEvent;)V+4
j 
javax.swing.AbstractButton.fireActionPerformed(Ljava/awt/event/ActionEvent;)V+84
j 
javax.swing.AbstractButton$Handler.actionPerformed(Ljava/awt/event/ActionEvent;)V+5
j 
javax.swing.DefaultButtonModel.fireActionPerformed(Ljava/awt/event/ActionEvent;)V+35
j  javax.swing.DefaultButtonModel.setPressed(Z)V+117
j 
javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Ljava/awt/event/MouseEvent;)V+35
j  java.awt.AWTEventMulticaster.mouseReleased(Ljava/awt/event/MouseEvent;)V+8
j  java.awt.Component.processMouseEvent(Ljava/awt/event/MouseEvent;)V+64
j  javax.swing.JComponent.processMouseEvent(Ljava/awt/event/MouseEvent;)V+23
j  java.awt.Component.processEvent(Ljava/awt/AWTEvent;)V+81
j  java.awt.Container.processEvent(Ljava/awt/AWTEvent;)V+18
j  java.awt.Component.dispatchEventImpl(Ljava/awt/AWTEvent;)V+589
j  java.awt.Container.dispatchEventImpl(Ljava/awt/AWTEvent;)V+42
j  java.awt.Component.dispatchEvent(Ljava/awt/AWTEvent;)V+2
j 
java.awt.LightweightDispatcher.retargetMouseEvent(Ljava/awt/Component;ILjava/awt/event/MouseEvent;)V+320
j 
java.awt.LightweightDispatcher.processMouseEvent(Ljava/awt/event/MouseEvent;)Z+139
j  java.awt.LightweightDispatcher.dispatchEvent(Ljava/awt/AWTEvent;)Z+50
j  java.awt.Container.dispatchEventImpl(Ljava/awt/AWTEvent;)V+12
j  java.awt.Window.dispatchEventImpl(Ljava/awt/AWTEvent;)V+19
j  java.awt.Component.dispatchEvent(Ljava/awt/AWTEvent;)V+2
j  java.awt.EventQueue.dispatchEvent(Ljava/awt/AWTEvent;)V+46
j  java.awt.EventDispatchThread.pumpOneEventForFilters(I)Z+192
j 
java.awt.EventDispatchThread.pumpEventsForFilter(ILjava/awt/Conditional;Ljava/awt/EventFilter;)V+30
j 
java.awt.EventDispatchThread.pumpEventsForHierarchy(ILjava/awt/Conditional;Ljava/awt/Component;)V+11
j  java.awt.EventDispatchThread.pumpEvents(ILjava/awt/Conditional;)V+4
j  java.awt.EventDispatchThread.pumpEvents(Ljava/awt/Conditional;)V+3
j  java.awt.EventDispatchThread.run()V+9
v  ~StubRoutines::call_stub

---------------  P R O C E S S  ---------------

Java Threads: ( => current thread )
  0x09999800 JavaThread "Java Sound Event Dispatcher" daemon [_thread_blocked,
id=3546, stack(0x01a74000,0x01ac5000)]
  0xb7705000 JavaThread "DestroyJavaVM" [_thread_blocked, id=3520,
stack(0x00110000,0x00161000)]
  0x8f8fc400 JavaThread "TimerQueue" daemon [_thread_blocked, id=3541,
stack(0x05b16000,0x05b67000)]
=>0xb7798800 JavaThread "AWT-EventQueue-0" [_thread_in_vm, id=3539,
stack(0x06fd4000,0x07025000)]
  0x8f8adc00 JavaThread "AWT-Shutdown" [_thread_blocked, id=3538,
stack(0x026cc000,0x0271d000)]
  0x8f891400 JavaThread "AWT-XAWT" daemon [_thread_in_native, id=3532,
stack(0x08461000,0x084b2000)]
  0x8f84b400 JavaThread "Java2D Disposer" daemon [_thread_blocked, id=3531,
stack(0x00c9b000,0x00cec000)]
  0xb77a5c00 JavaThread "Low Memory Detector" daemon [_thread_blocked, id=3529,
stack(0x00890000,0x008e1000)]
  0xb77a3800 JavaThread "CompilerThread1" daemon [_thread_blocked, id=3528,
stack(0x0080f000,0x00890000)]
  0xb77a2000 JavaThread "CompilerThread0" daemon [_thread_blocked, id=3527,
stack(0x0078e000,0x0080f000)]
  0xb77a0800 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=3526,
stack(0x00713000,0x00764000)]
  0xb778fc00 JavaThread "Finalizer" daemon [_thread_blocked, id=3525,
stack(0x006c2000,0x00713000)]
  0xb778e800 JavaThread "Reference Handler" daemon [_thread_blocked, id=3524,
stack(0x00271000,0x002c2000)]

Other Threads:
  0xb778b400 VMThread [stack: 0x008f4000,0x00975000] [id=3523]
  0xb77a7c00 WatcherThread [stack: 0x00b7b000,0x00bfc000] [id=3530]

VM state:not at safepoint (normal execution)

VM Mutex/Monitor currently owned by a thread:  ([mutex/lock_event])
[0xb77031c8] StringTable_lock - owner thread: 0xb7798800

Heap
 PSYoungGen      total 29312K, used 18590K [0xb3f00000, 0xb60e0000, 0xb7700000)
  eden space 24576K, 71% used [0xb3f00000,0xb5023868,0xb5700000)
  from space 4736K, 21% used [0xb5c40000,0xb5d44118,0xb60e0000)
  to   space 5056K, 0% used [0xb5700000,0xb5700000,0xb5bf0000)
 PSOldGen        total 28672K, used 7257K [0x97f00000, 0x99b00000, 0xb3f00000)
  object space 28672K, 25% used [0x97f00000,0x98616758,0x99b00000)
 PSPermGen       total 16384K, used 14135K [0x8ff00000, 0x90f00000, 0x97f00000)
  object space 16384K, 86% used [0x8ff00000,0x90ccde38,0x90f00000)

Dynamic libraries:
00110000-00113000 ---p 00000000 00:00 0 
00113000-00161000 rwxp 00000000 00:00 0 
00161000-00168000 r-xp 00000000 fd:00 81208      /lib/librt-2.11.1.so
00168000-00169000 r--p 00006000 fd:00 81208      /lib/librt-2.11.1.so
00169000-0016a000 rw-p 00007000 fd:00 81208      /lib/librt-2.11.1.so
0016a000-00170000 r-xp 00000000 fd:00 19491     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/native_threads/libhpi.so
00170000-00171000 rw-p 00006000 fd:00 19491     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/native_threads/libhpi.so
00171000-0017a000 rwxp 00000000 00:00 0 
0017a000-00231000 rwxp 00000000 00:00 0 
00231000-00239000 rwxp 00000000 00:00 0 
00239000-00271000 rwxp 00000000 00:00 0 
00271000-00274000 ---p 00000000 00:00 0 
00274000-002c2000 rwxp 00000000 00:00 0 
002c2000-002ca000 r-xp 00000000 fd:00 86652      /usr/lib/libXrender.so.1.3.0
002ca000-002cb000 rw-p 00008000 fd:00 86652      /usr/lib/libXrender.so.1.3.0
002cb000-002cc000 r--p 00000000 00:00 0 
002cc000-002d7000 r-xp 00000000 fd:00 3485       /lib/libnss_files-2.11.1.so
002d7000-002d8000 r--p 0000a000 fd:00 3485       /lib/libnss_files-2.11.1.so
002d8000-002d9000 rw-p 0000b000 fd:00 3485       /lib/libnss_files-2.11.1.so
002d9000-002e1000 rwxp 00000000 00:00 0 
002e1000-00319000 rwxp 00000000 00:00 0 
00319000-00327000 rwxp 00000000 00:00 0 
00327000-003f9000 rwxp 00000000 00:00 0 
003f9000-0040a000 rwxp 00000000 00:00 0 
0040a000-00415000 rwxp 00000000 00:00 0 
00415000-00416000 rwxp 00000000 00:00 0 
00416000-00417000 ---p 00000000 00:00 0 
00417000-00497000 rwxp 00000000 00:00 0 
00497000-004da000 r-xp 00000000 fd:00 19497     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/xawt/libmawt.so
004da000-004dc000 rw-p 00043000 fd:00 19497     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/xawt/libmawt.so
004dc000-004dd000 rw-p 00000000 00:00 0 
004dd000-004e2000 r-xp 00000000 fd:00 27609      /usr/lib/libXtst.so.6.1.0
004e2000-004e3000 rw-p 00004000 fd:00 27609      /usr/lib/libXtst.so.6.1.0
004e3000-004e5000 r-xp 00000000 fd:00 86648      /usr/lib/libXau.so.6.0.0
004e5000-004e6000 rw-p 00001000 fd:00 86648      /usr/lib/libXau.so.6.0.0
004e7000-004f2000 r-xp 00000000 fd:00 19489     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libverify.so
004f2000-004f3000 rw-p 0000b000 fd:00 19489     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libverify.so
004f3000-00501000 rwxp 00000000 00:00 0 
00501000-005d3000 rwxp 00000000 00:00 0 
005d3000-005d4000 ---p 00000000 00:00 0 
005d4000-00654000 rwxp 00000000 00:00 0 
00654000-00664000 r-xp 00000000 fd:00 86658      /usr/lib/libXext.so.6.4.0
00664000-00665000 rw-p 00010000 fd:00 86658      /usr/lib/libXext.so.6.4.0
00665000-0066c000 r-xp 00000000 fd:00 19482     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnio.so
0066c000-0066d000 rw-p 00006000 fd:00 19482     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnio.so
0066d000-0066e000 r-xp 00000000 fd:00 19476     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjsound.so
0066e000-0066f000 rw-p 00000000 fd:00 19476     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjsound.so
00670000-00676000 r-xp 00000000 fd:00 19490     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libzip.so
00676000-00677000 rw-p 00006000 fd:00 19490     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libzip.so
00677000-00684000 r-xp 00000000 fd:00 21903      /usr/lib/libXi.so.6.1.0
00684000-00685000 rw-p 0000d000 fd:00 21903      /usr/lib/libXi.so.6.1.0
00685000-00698000 r-xp 00000000 fd:00 19481     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnet.so
00698000-00699000 rw-p 00013000 fd:00 19481     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libnet.so
00699000-0069d000 r-xp 00000000 fd:00 86662      /usr/lib/libXfixes.so.3.1.0
0069d000-0069e000 rw-p 00003000 fd:00 86662      /usr/lib/libXfixes.so.3.1.0
0069e000-006c0000 r-xp 00000000 fd:00 19470     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjava.so
006c0000-006c2000 rw-p 00022000 fd:00 19470     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjava.so
006c2000-006c5000 ---p 00000000 00:00 0 
006c5000-00713000 rwxp 00000000 00:00 0 
00713000-00716000 ---p 00000000 00:00 0 
00716000-00764000 rwxp 00000000 00:00 0 
00764000-00781000 r-xp 00000000 fd:00 86649      /usr/lib/libxcb.so.1.1.0
00781000-00782000 rw-p 0001c000 fd:00 86649      /usr/lib/libxcb.so.1.1.0
00782000-0078b000 r-xp 00000000 fd:00 86663      /usr/lib/libXcursor.so.1.0.2
0078b000-0078c000 rw-p 00009000 fd:00 86663      /usr/lib/libXcursor.so.1.0.2
0078e000-00791000 ---p 00000000 00:00 0 
00791000-0080f000 rwxp 00000000 00:00 0 
0080f000-00812000 ---p 00000000 00:00 0 
00812000-00890000 rwxp 00000000 00:00 0 
00890000-00893000 ---p 00000000 00:00 0 
00893000-008e1000 rwxp 00000000 00:00 0 
008e1000-008f0000 r-xp 00000000 08:01 217137    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/native/linux-x86/libcivil.so
008f0000-008f1000 rw-p 0000e000 08:01 217137    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/native/linux-x86/libcivil.so
008f4000-008f5000 ---p 00000000 00:00 0 
008f5000-00975000 rwxp 00000000 00:00 0 
00975000-00982000 r-xp 00000000 fd:00 19477     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjsoundalsa.so
00982000-00983000 rw-p 0000c000 fd:00 19477     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libjsoundalsa.so
00983000-00988000 r-xp 00000000 fd:00 58482     
/usr/lib/alsa-lib/libasound_module_pcm_pulse.so
00988000-00989000 rw-p 00004000 fd:00 58482     
/usr/lib/alsa-lib/libasound_module_pcm_pulse.so
0098a000-009a8000 r-xp 00000000 fd:00 81204      /lib/ld-2.11.1.so
009a8000-009a9000 r--p 0001d000 fd:00 81204      /lib/ld-2.11.1.so
009a9000-009aa000 rw-p 0001e000 fd:00 81204      /lib/ld-2.11.1.so
009ac000-00b1b000 r-xp 00000000 fd:00 81206      /lib/libc-2.11.1.so
00b1b000-00b1d000 r--p 0016e000 fd:00 81206      /lib/libc-2.11.1.so
00b1d000-00b1e000 rw-p 00170000 fd:00 81206      /lib/libc-2.11.1.so
00b1e000-00b21000 rw-p 00000000 00:00 0 
00b23000-00b26000 r-xp 00000000 fd:00 86650      /lib/libdl-2.11.1.so
00b26000-00b27000 r--p 00002000 fd:00 86650      /lib/libdl-2.11.1.so
00b27000-00b28000 rw-p 00003000 fd:00 86650      /lib/libdl-2.11.1.so
00b2a000-00b40000 r-xp 00000000 fd:00 81207      /lib/libpthread-2.11.1.so
00b40000-00b41000 r--p 00015000 fd:00 81207      /lib/libpthread-2.11.1.so
00b41000-00b42000 rw-p 00016000 fd:00 81207      /lib/libpthread-2.11.1.so
00b42000-00b44000 rw-p 00000000 00:00 0 
00b46000-00b49000 r-xp 00000000 fd:00 86691     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/jli/libjli.so
00b49000-00b4a000 rw-p 00002000 fd:00 86691     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/jli/libjli.so
00b4a000-00b4e000 r-xp 00000000 fd:00 13580      /lib/libuuid.so.1.3.0
00b4e000-00b4f000 rw-p 00003000 fd:00 13580      /lib/libuuid.so.1.3.0
00b51000-00b79000 r-xp 00000000 fd:00 22384      /lib/libm-2.11.1.so
00b79000-00b7a000 r--p 00027000 fd:00 22384      /lib/libm-2.11.1.so
00b7a000-00b7b000 rw-p 00028000 fd:00 22384      /lib/libm-2.11.1.so
00b7b000-00b7c000 ---p 00000000 00:00 0 
00b7c000-00bfc000 rwxp 00000000 00:00 0 
00bfc000-00c42000 r-xp 00000000 fd:00 19463     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libfontmanager.so
00c42000-00c44000 rw-p 00046000 fd:00 19463     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libfontmanager.so
00c44000-00c49000 rw-p 00000000 00:00 0 
00c49000-00c66000 r-xp 00000000 fd:00 5336      
/lib/libgcc_s-4.4.3-20100127.so.1
00c66000-00c67000 rw-p 0001c000 fd:00 5336      
/lib/libgcc_s-4.4.3-20100127.so.1
00c67000-00c6e000 r-xp 00000000 fd:00 87615      /usr/lib/libSM.so.6.0.0
00c6e000-00c6f000 rw-p 00006000 fd:00 87615      /usr/lib/libSM.so.6.0.0
00c6f000-00c77000 r-xp 00000000 fd:00 11789      /lib/libwrap.so.0.7.6
00c77000-00c78000 rw-p 00008000 fd:00 11789      /lib/libwrap.so.0.7.6
00c78000-00c7d000 r-xp 00000000 fd:00 60056      /usr/lib/libogg.so.0.6.0
00c7d000-00c7e000 rw-p 00005000 fd:00 60056      /usr/lib/libogg.so.0.6.0
00c7e000-00c82000 r-xp 00000000 fd:00 81209      /lib/libcap-ng.so.0.0.0
00c82000-00c83000 r--p 00003000 fd:00 81209      /lib/libcap-ng.so.0.0.0
00c83000-00c84000 rw-p 00004000 fd:00 81209      /lib/libcap-ng.so.0.0.0
00c88000-00c9a000 r-xp 00000000 fd:00 86646      /lib/libz.so.1.2.3
00c9a000-00c9b000 rw-p 00011000 fd:00 86646      /lib/libz.so.1.2.3
00c9b000-00c9e000 ---p 00000000 00:00 0 
00c9e000-00cec000 rwxp 00000000 00:00 0 
00cec000-00d03000 r-xp 00000000 fd:00 81655      /usr/lib/libICE.so.6.3.0
00d03000-00d05000 rw-p 00016000 fd:00 81655      /usr/lib/libICE.so.6.3.0
00d05000-00d06000 rw-p 00000000 00:00 0 
00d17000-00d18000 r-xp 00000000 00:00 0          [vdso]
00d18000-01341000 r-xp 00000000 fd:00 19496     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/server/libjvm.so
01341000-01391000 rw-p 00628000 fd:00 19496     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/server/libjvm.so
01391000-017b3000 rw-p 00000000 00:00 0 
017b3000-01835000 r-xp 00000000 fd:00 19461     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libawt.so
01835000-0183c000 rw-p 00081000 fd:00 19461     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/libawt.so
0183c000-01860000 rw-p 00000000 00:00 0 
01860000-01863000 rwxp 00000000 00:00 0 
01863000-018b1000 rwxp 00000000 00:00 0 
018b1000-01952000 r-xp 00000000 fd:00 50452      /usr/lib/libstdc++.so.5.0.5
01952000-01968000 rw-p 000a0000 fd:00 50452      /usr/lib/libstdc++.so.5.0.5
01968000-0196d000 rw-p 00000000 00:00 0 
0196d000-019b3000 r-xp 00000000 fd:00 50259      /usr/lib/libpulse.so.0.12.2
019b3000-019b4000 rw-p 00045000 fd:00 50259      /usr/lib/libpulse.so.0.12.2
019b4000-01a05000 r-xp 00000000 fd:00 7786      
/usr/lib/libpulsecommon-0.9.21.so
01a05000-01a06000 rw-p 00051000 fd:00 7786      
/usr/lib/libpulsecommon-0.9.21.so
01a06000-01a6e000 r-xp 00000000 fd:00 87629      /usr/lib/libsndfile.so.1.0.20
01a6e000-01a70000 rw-p 00067000 fd:00 87629      /usr/lib/libsndfile.so.1.0.20
01a70000-01a74000 rw-p 00000000 00:00 0 
01a74000-01a77000 ---p 00000000 00:00 0 
01a77000-01ac5000 rwxp 00000000 00:00 0 
01cdb000-01d17000 r-xp 00000000 fd:00 11748      /usr/lib/libFLAC.so.8.2.0
01d17000-01d18000 rw-p 0003c000 fd:00 11748      /usr/lib/libFLAC.so.8.2.0
01dfc000-01f30000 r-xp 00000000 fd:00 86651      /usr/lib/libX11.so.6.3.0
01f30000-01f34000 rw-p 00133000 fd:00 86651      /usr/lib/libX11.so.6.3.0
02000000-020ec000 r-xp 00000000 fd:00 5959       /usr/lib/libvorbisenc.so.2.0.6
020ec000-020fa000 rw-p 000ec000 fd:00 5959       /usr/lib/libvorbisenc.so.2.0.6
02199000-0219e000 r-xp 00000000 fd:00 6014       /usr/lib/libasyncns.so.0.3.1
0219e000-0219f000 rw-p 00004000 fd:00 6014       /usr/lib/libasyncns.so.0.3.1
0237b000-02462000 r-xp 00000000 fd:00 50399      /lib/libasound.so.2.0.0
02462000-02466000 rw-p 000e7000 fd:00 50399      /lib/libasound.so.2.0.0
026cc000-026cf000 ---p 00000000 00:00 0 
026cf000-0271d000 rwxp 00000000 00:00 0 
02773000-029b3000 rwxp 00000000 00:00 0 
029b3000-05773000 rwxp 00000000 00:00 0 
05b16000-05b19000 ---p 00000000 00:00 0 
05b19000-05b67000 rwxp 00000000 00:00 0 
06006000-0604b000 r-xp 00000000 fd:00 81608      /lib/libdbus-1.so.3.4.0
0604b000-0604c000 r--p 00044000 fd:00 81608      /lib/libdbus-1.so.3.4.0
0604c000-0604d000 rw-p 00045000 fd:00 81608      /lib/libdbus-1.so.3.4.0
061c5000-061ef000 r-xp 00000000 fd:00 6258       /usr/lib/libvorbis.so.0.4.3
061ef000-061f0000 rw-p 00029000 fd:00 6258       /usr/lib/libvorbis.so.0.4.3
061f2000-06209000 r-xp 00000000 fd:00 86734      /lib/libnsl-2.11.1.so
06209000-0620a000 r--p 00016000 fd:00 86734      /lib/libnsl-2.11.1.so
0620a000-0620b000 rw-p 00017000 fd:00 86734      /lib/libnsl-2.11.1.so
0620b000-0620d000 rw-p 00000000 00:00 0 
0620d000-0620e000 ---p 00000000 00:00 0 
0620e000-06c0e000 rwxp 00000000 00:00 0 
06fd4000-06fd7000 ---p 00000000 00:00 0 
06fd7000-07025000 rwxp 00000000 00:00 0 
077ab000-077bf000 r-xp 00000000 fd:00 86666      /lib/libresolv-2.11.1.so
077bf000-077c0000 ---p 00014000 fd:00 86666      /lib/libresolv-2.11.1.so
077c0000-077c1000 r--p 00014000 fd:00 86666      /lib/libresolv-2.11.1.so
077c1000-077c2000 rw-p 00015000 fd:00 86666      /lib/libresolv-2.11.1.so
077c2000-077c4000 rw-p 00000000 00:00 0 
07d48000-07ddc000 r-xp 00000000 fd:00 86643      /usr/lib/libfreetype.so.6.3.22
07ddc000-07de0000 rw-p 00094000 fd:00 86643      /usr/lib/libfreetype.so.6.3.22
08048000-08050000 r-xp 00000000 fd:00 82292     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/bin/java
08050000-08052000 rw-p 00007000 fd:00 82292     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/bin/java
08461000-08464000 ---p 00000000 00:00 0 
08464000-084b2000 rwxp 00000000 00:00 0 
084f4000-084f7000 rwxp 00000000 00:00 0 
084f7000-08545000 rwxp 00000000 00:00 0 
09822000-09d6c000 rw-p 00000000 00:00 0          [heap]
8af50000-8af57000 r--s 00000000 fd:00 68076     
/usr/lib/gconv/gconv-modules.cache
8ef58000-8ef59000 rw-p 00000000 00:00 0 
8ef59000-8ef63000 r--s 00000000 fd:00 15516     
/usr/share/fonts/default/ghostscript/hrscs.pfa
8ef63000-8ef72000 r--s 00000000 fd:00 15485     
/usr/share/fonts/default/ghostscript/hrger.pfa
8ef72000-8ef83000 r--s 00000000 fd:00 15474     
/usr/share/fonts/default/ghostscript/bchr.pfa
8ef83000-8ef95000 r--s 00000000 fd:00 15520     
/usr/share/fonts/default/ghostscript/putb.pfa
8ef95000-8efa0000 r--s 00000000 fd:00 15500     
/usr/share/fonts/default/ghostscript/hrpldi.pfa
8efa0000-8efab000 r--s 00000000 fd:00 15513     
/usr/share/fonts/default/ghostscript/hrscc.pfa
8efab000-8efbd000 r--s 00000000 fd:00 15522     
/usr/share/fonts/default/ghostscript/putr.pfa
8efbd000-8efcc000 r--s 00000000 fd:00 15509     
/usr/share/fonts/default/ghostscript/hrplt.pfa
8efcc000-8efd7000 r--s 00000000 fd:00 15497     
/usr/share/fonts/default/ghostscript/hrpld.pfa
8efd7000-8efe6000 r--s 00000000 fd:00 15491     
/usr/share/fonts/default/ghostscript/hrgrr.pfa
8efe6000-8eff7000 r--s 00000000 fd:00 15470     
/usr/share/fonts/default/ghostscript/bchb.pfa
8eff7000-8f006000 r--s 00000000 fd:00 15512     
/usr/share/fonts/default/ghostscript/hrplti.pfa
8f006000-8f017000 r--s 00000000 fd:00 15472     
/usr/share/fonts/default/ghostscript/bchbi.pfa
8f017000-8f02a000 r--s 00000000 fd:00 15521     
/usr/share/fonts/default/ghostscript/putbi.pfa
8f02a000-8f03b000 r--s 00000000 fd:00 15476     
/usr/share/fonts/default/ghostscript/bchri.pfa
8f03b000-8f048000 r--s 00000000 fd:00 15494     
/usr/share/fonts/default/ghostscript/hritr.pfa
8f048000-8f05b000 r--s 00000000 fd:00 15523     
/usr/share/fonts/default/ghostscript/putri.pfa
8f05b000-8f06c000 r--s 00000000 fd:00 14987     
/usr/share/fonts/default/Type1/n019024l.pfb
8f06c000-8f07f000 r--s 00000000 fd:00 14995     
/usr/share/fonts/default/Type1/n019064l.pfb
8f07f000-8f092000 r--s 00000000 fd:00 14965     
/usr/share/fonts/default/Type1/b018015l.pfb
8f092000-8f0a4000 r--s 00000000 fd:00 14983     
/usr/share/fonts/default/Type1/n019004l.pfb
8f0a4000-8f0bf000 r--s 00000000 fd:00 14973     
/usr/share/fonts/default/Type1/c059016l.pfb
8f0bf000-8f0d7000 r--s 00000000 fd:00 15005     
/usr/share/fonts/default/Type1/n022003l.pfb
8f0d7000-8f0eb000 r--s 00000000 fd:00 14981     
/usr/share/fonts/default/Type1/n019003l.pfb
8f0eb000-8f101000 r--s 00000000 fd:00 15003     
/usr/share/fonts/default/Type1/n021024l.pfb
8f101000-8f113000 r--s 00000000 fd:00 14991     
/usr/share/fonts/default/Type1/n019044l.pfb
8f113000-8f12e000 r--s 00000000 fd:00 15017     
/usr/share/fonts/default/Type1/p052023l.pfb
8f12e000-8f13e000 r--s 00000000 fd:00 14957     
/usr/share/fonts/default/Type1/a010015l.pfb
8f13e000-8f155000 r--s 00000000 fd:00 15023     
/usr/share/fonts/default/Type1/z003034l.pfb
8f155000-8f16b000 r--s 00000000 fd:00 15009     
/usr/share/fonts/default/Type1/n022023l.pfb
8f16b000-8f184000 r--s 00000000 fd:00 14999     
/usr/share/fonts/default/Type1/n021004l.pfb
8f184000-8f19d000 r--s 00000000 fd:00 14963     
/usr/share/fonts/default/Type1/b018012l.pfb
8f19d000-8f1a9000 r--s 00000000 fd:00 14979     
/usr/share/fonts/default/Type1/d050000l.pfb
8f1a9000-8f1c1000 r--s 00000000 fd:00 14977     
/usr/share/fonts/default/Type1/c059036l.pfb
8f1c1000-8f1dc000 r--s 00000000 fd:00 15013     
/usr/share/fonts/default/Type1/p052003l.pfb
8f1dc000-8f1ee000 r--s 00000000 fd:00 14969     
/usr/share/fonts/default/Type1/b018035l.pfb
8f1ee000-8f200000 r--s 00000000 fd:00 14989     
/usr/share/fonts/default/Type1/n019043l.pfb
8f200000-8f26a000 rw-p 00000000 00:00 0 
8f26a000-8f300000 ---p 00000000 00:00 0 
8f300000-8f325000 rw-p 00000000 00:00 0 
8f325000-8f400000 ---p 00000000 00:00 0 
8f400000-8f4f1000 rw-p 00000000 00:00 0 
8f4f1000-8f500000 ---p 00000000 00:00 0 
8f507000-8f510000 r--s 00000000 fd:00 15021     
/usr/share/fonts/default/Type1/s050000l.pfb
8f510000-8f52a000 r--s 00000000 fd:00 14971     
/usr/share/fonts/default/Type1/c059013l.pfb
8f52a000-8f541000 r--s 00000000 fd:00 15001     
/usr/share/fonts/default/Type1/n021023l.pfb
8f541000-8f559000 r--s 00000000 fd:00 14975     
/usr/share/fonts/default/Type1/c059033l.pfb
8f559000-8f569000 r--s 00000000 fd:00 14959     
/usr/share/fonts/default/Type1/a010033l.pfb
8f569000-8f57a000 r--s 00000000 fd:00 14993     
/usr/share/fonts/default/Type1/n019063l.pfb
8f57a000-8f593000 r--s 00000000 fd:00 14997     
/usr/share/fonts/default/Type1/n021003l.pfb
8f593000-8f5a4000 r--s 00000000 fd:00 14985     
/usr/share/fonts/default/Type1/n019023l.pfb
8f5a4000-8f5c0000 r--s 00000000 fd:00 15019     
/usr/share/fonts/default/Type1/p052024l.pfb
8f5c0000-8f5d9000 r--s 00000000 fd:00 15007     
/usr/share/fonts/default/Type1/n022004l.pfb
8f5d9000-8f5ea000 r--s 00000000 fd:00 14961     
/usr/share/fonts/default/Type1/a010035l.pfb
8f5ea000-8f600000 r--s 00000000 fd:00 15011     
/usr/share/fonts/default/Type1/n022024l.pfb
8f600000-8f6fa000 rw-p 00000000 00:00 0 
8f6fa000-8f700000 ---p 00000000 00:00 0 
8f700000-8f7fa000 rw-p 00000000 00:00 0 
8f7fa000-8f800000 ---p 00000000 00:00 0 
8f800000-8f900000 rw-p 00000000 00:00 0 
8f910000-8f911000 rw-p 00000000 00:00 0 
8f911000-8f926000 r--s 00000000 fd:00 14967     
/usr/share/fonts/default/Type1/b018032l.pfb
8f926000-8f936000 r--s 00000000 fd:00 14955     
/usr/share/fonts/default/Type1/a010013l.pfb
8f936000-8f951000 r--s 00000000 fd:00 15015     
/usr/share/fonts/default/Type1/p052004l.pfb
8f951000-8f954000 r--s 00000000 fd:00 82487     
/var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-le32d4.cache-3
8f954000-8f95a000 r--s 00000000 fd:00 82508     
/var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-le32d4.cache-3
8f95a000-8f95b000 r--s 00000000 fd:00 85600     
/var/cache/fontconfig/afda88ba2c9de689dfd6d8c6d2e4e427-le32d4.cache-3
8f95b000-8f95d000 r--s 00000000 fd:00 82533     
/var/cache/fontconfig/2e1514a9fdd499050989183bb65136db-le32d4.cache-3
8f95d000-8f95f000 r--s 00000000 fd:00 82532     
/var/cache/fontconfig/5c755b2f27115486aa6359c84dd3cbda-le32d4.cache-3
8f95f000-8f960000 r--s 00000000 fd:00 82531     
/var/cache/fontconfig/3f821257dd33660ba7bbb45c32deb84c-le32d4.cache-3
8f960000-8f967000 r--s 000fe000 fd:00 19527     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/resources.jar
8f967000-8f969000 r--s 0000c000 08:01 217124    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jheora-patch.jar
8f969000-8f96b000 r--s 00009000 08:01 217132    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/theora-java.jar
8f96b000-8fb6b000 r--p 00000000 fd:00 82256      /usr/lib/locale/locale-archive
8fb6b000-8fd00000 r--s 038ec000 fd:00 19529     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/rt.jar
8fd00000-8fd34000 rw-p 00000000 00:00 0 
8fd34000-8fe00000 ---p 00000000 00:00 0 
8fe00000-8ff00000 rw-p 00000000 00:00 0 
8ff00000-90f00000 rwxp 00000000 00:00 0 
90f00000-97f00000 rwxp 00000000 00:00 0 
97f00000-99b00000 rwxp 00000000 00:00 0 
99b00000-b3f00000 rwxp 00000000 00:00 0 
b3f00000-b60e0000 rwxp 00000000 00:00 0 
b60e0000-b7700000 rwxp 00000000 00:00 0 
b7700000-b77ff000 rw-p 00000000 00:00 0 
b77ff000-b7800000 ---p 00000000 00:00 0 
b7800000-b7802000 r--s 00000000 fd:00 82530     
/var/cache/fontconfig/830f035fa84a65ce80e050178dbb630d-le32d4.cache-3
b7802000-b7803000 r--s 00000000 fd:00 82529     
/var/cache/fontconfig/81a173283b451552b599cfaafd6236bd-le32d4.cache-3
b7803000-b7804000 r--s 00000000 fd:00 82528     
/var/cache/fontconfig/6cfc7d49b27ba7d3eb71ab86e04def2c-le32d4.cache-3
b7804000-b7805000 r--s 00000000 fd:00 82527     
/var/cache/fontconfig/cfde08ab28ad1d91784abb10973575e3-le32d4.cache-3
b7805000-b7806000 r--s 00000000 fd:00 82526     
/var/cache/fontconfig/b887eea8f1b96e1d899b44ed6681fc27-le32d4.cache-3
b7806000-b7807000 r--s 00000000 fd:00 82525     
/var/cache/fontconfig/860639f272b8b4b3094f9e399e41bccd-le32d4.cache-3
b7807000-b7808000 r--s 00000000 fd:00 82524     
/var/cache/fontconfig/211368abcb0ff835c229ff05c9ec01dc-le32d4.cache-3
b7808000-b7809000 r--s 00000000 fd:00 82523     
/var/cache/fontconfig/c46020d7221988a13df853d2b46304fc-le32d4.cache-3
b7809000-b780a000 r--s 00000000 fd:00 82522     
/var/cache/fontconfig/d290456e58f67f52b0f8f224126f9ea8-le32d4.cache-3
b780a000-b780b000 r--s 00000000 fd:00 82521     
/var/cache/fontconfig/b63c21b9c3e5b4a4009aa5966b421593-le32d4.cache-3
b780b000-b780c000 r--s 00000000 fd:00 82520     
/var/cache/fontconfig/df893b4576ad6107f9397134092c4059-le32d4.cache-3
b780c000-b780d000 r--s 00000000 fd:00 82519     
/var/cache/fontconfig/ff627ea95a65192232277bf7c8a56f23-le32d4.cache-3
b780d000-b780e000 r--s 00000000 fd:00 82518     
/var/cache/fontconfig/900402270e15d763a6e008bb2d4c7686-le32d4.cache-3
b780e000-b780f000 r--s 00000000 fd:00 82517     
/var/cache/fontconfig/2881ed3fd21ca306ddad6f9b0dd3189f-le32d4.cache-3
b780f000-b7810000 r--s 00000000 fd:00 82516     
/var/cache/fontconfig/3c3fb04d32a5211b073874b125d29701-le32d4.cache-3
b7810000-b7811000 r--s 00000000 fd:00 82515     
/var/cache/fontconfig/e61abf8156cc476151baa07d67337cae-le32d4.cache-3
b7811000-b7814000 r--s 00000000 fd:00 82514     
/var/cache/fontconfig/b67b32625a2bb51b023d3814a918f351-le32d4.cache-3
b7814000-b7815000 r--s 00000000 fd:00 82513     
/var/cache/fontconfig/d3379abda271c4acd2ad0c01f565d0b0-le32d4.cache-3
b7815000-b7818000 r--s 00000000 fd:00 82512     
/var/cache/fontconfig/46b47dbc682d2ca4191e148ea7bde7f2-le32d4.cache-3
b7818000-b7819000 r--s 00000000 fd:00 82511     
/var/cache/fontconfig/b4d0b56f766d89640448751fcd18ec1e-le32d4.cache-3
b7819000-b781b000 r--s 00000000 fd:00 85598     
/var/cache/fontconfig/614d1caaa4d7914789410f6367de37ca-le32d4.cache-3
b781b000-b7822000 r--s 00000000 fd:00 82510     
/var/cache/fontconfig/12b26b760a24f8b4feb03ad48a333a72-le32d4.cache-3
b7822000-b7828000 r--s 00000000 fd:00 82506     
/var/cache/fontconfig/928306c3ad40271d946e41014a49fc28-le32d4.cache-3
b7828000-b7830000 r--s 00000000 fd:00 82505     
/var/cache/fontconfig/18db0204b1f108dd01663673626fcd3d-le32d4.cache-3
b7830000-b7831000 r--s 00000000 fd:00 82504     
/var/cache/fontconfig/1248881498ac025e45c3042f6afe9284-le32d4.cache-3
b7831000-b7834000 r--s 00000000 fd:00 82487     
/var/cache/fontconfig/87f5e051180a7a75f16eb6fe7dbd3749-le32d4.cache-3
b7834000-b783a000 r--s 00000000 fd:00 82508     
/var/cache/fontconfig/b79f3aaa7d385a141ab53ec885cc22a8-le32d4.cache-3
b783a000-b783b000 r--s 00000000 fd:00 85600     
/var/cache/fontconfig/afda88ba2c9de689dfd6d8c6d2e4e427-le32d4.cache-3
b783b000-b783d000 r--s 00000000 fd:00 82533     
/var/cache/fontconfig/2e1514a9fdd499050989183bb65136db-le32d4.cache-3
b783d000-b783f000 r--s 00000000 fd:00 82532     
/var/cache/fontconfig/5c755b2f27115486aa6359c84dd3cbda-le32d4.cache-3
b783f000-b7840000 r--s 00000000 fd:00 82531     
/var/cache/fontconfig/3f821257dd33660ba7bbb45c32deb84c-le32d4.cache-3
b7840000-b7842000 r--s 00000000 fd:00 82530     
/var/cache/fontconfig/830f035fa84a65ce80e050178dbb630d-le32d4.cache-3
b7842000-b7843000 r--s 00000000 fd:00 82529     
/var/cache/fontconfig/81a173283b451552b599cfaafd6236bd-le32d4.cache-3
b7843000-b7844000 r--s 00000000 fd:00 82528     
/var/cache/fontconfig/6cfc7d49b27ba7d3eb71ab86e04def2c-le32d4.cache-3
b7844000-b7845000 r--s 00000000 fd:00 82527     
/var/cache/fontconfig/cfde08ab28ad1d91784abb10973575e3-le32d4.cache-3
b7845000-b7846000 r--s 00000000 fd:00 82526     
/var/cache/fontconfig/b887eea8f1b96e1d899b44ed6681fc27-le32d4.cache-3
b7846000-b7847000 r--s 00000000 fd:00 82525     
/var/cache/fontconfig/860639f272b8b4b3094f9e399e41bccd-le32d4.cache-3
b7847000-b7848000 r--s 00000000 fd:00 82524     
/var/cache/fontconfig/211368abcb0ff835c229ff05c9ec01dc-le32d4.cache-3
b7848000-b7849000 r--s 00000000 fd:00 82523     
/var/cache/fontconfig/c46020d7221988a13df853d2b46304fc-le32d4.cache-3
b7849000-b784a000 r--s 00000000 fd:00 82522     
/var/cache/fontconfig/d290456e58f67f52b0f8f224126f9ea8-le32d4.cache-3
b784a000-b784b000 r--s 00000000 fd:00 82521     
/var/cache/fontconfig/b63c21b9c3e5b4a4009aa5966b421593-le32d4.cache-3
b784b000-b784c000 r--s 00000000 fd:00 82520     
/var/cache/fontconfig/df893b4576ad6107f9397134092c4059-le32d4.cache-3
b784c000-b784d000 r--s 00000000 fd:00 82519     
/var/cache/fontconfig/ff627ea95a65192232277bf7c8a56f23-le32d4.cache-3
b784d000-b784e000 r--s 00000000 fd:00 82518     
/var/cache/fontconfig/900402270e15d763a6e008bb2d4c7686-le32d4.cache-3
b784e000-b784f000 r--s 00000000 fd:00 82517     
/var/cache/fontconfig/2881ed3fd21ca306ddad6f9b0dd3189f-le32d4.cache-3
b784f000-b7850000 r--s 00000000 fd:00 82516     
/var/cache/fontconfig/3c3fb04d32a5211b073874b125d29701-le32d4.cache-3
b7850000-b7851000 r--s 00000000 fd:00 82515     
/var/cache/fontconfig/e61abf8156cc476151baa07d67337cae-le32d4.cache-3
b7851000-b7854000 r--s 00000000 fd:00 82514     
/var/cache/fontconfig/b67b32625a2bb51b023d3814a918f351-le32d4.cache-3
b7854000-b7855000 r--s 00000000 fd:00 82513     
/var/cache/fontconfig/d3379abda271c4acd2ad0c01f565d0b0-le32d4.cache-3
b7855000-b7858000 r--s 00000000 fd:00 82512     
/var/cache/fontconfig/46b47dbc682d2ca4191e148ea7bde7f2-le32d4.cache-3
b7858000-b7859000 r--s 00000000 fd:00 82511     
/var/cache/fontconfig/b4d0b56f766d89640448751fcd18ec1e-le32d4.cache-3
b7859000-b785b000 r--s 00000000 fd:00 85598     
/var/cache/fontconfig/614d1caaa4d7914789410f6367de37ca-le32d4.cache-3
b785b000-b7862000 r--s 00000000 fd:00 82510     
/var/cache/fontconfig/12b26b760a24f8b4feb03ad48a333a72-le32d4.cache-3
b7862000-b7868000 r--s 00000000 fd:00 82506     
/var/cache/fontconfig/928306c3ad40271d946e41014a49fc28-le32d4.cache-3
b7868000-b7870000 r--s 00000000 fd:00 82505     
/var/cache/fontconfig/18db0204b1f108dd01663673626fcd3d-le32d4.cache-3
b7870000-b7871000 r--s 00000000 fd:00 82504     
/var/cache/fontconfig/1248881498ac025e45c3042f6afe9284-le32d4.cache-3
b7871000-b7873000 r--s 0000e000 08:01 217121    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/ffmpeg-java.jar
b7873000-b7876000 r--s 0003f000 08:01 217126    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jna.jar
b7876000-b787e000 r--s 0003b000 08:01 217122    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/gstreamer-java.jar
b787e000-b7880000 r--s 00017000 08:01 217129    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jspeex.jar
b7880000-b7882000 r--s 00002000 08:01 217134    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/vorbisspi1.0.2.jar
b7882000-b7883000 r--s 00001000 08:01 217127    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jogg-0.0.7.jar
b7883000-b7885000 r--s 0000d000 08:01 217128    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jorbis-0.0.15.jar
b7885000-b7886000 r--s 00005000 08:01 217131    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/mp3spi1.9.4.jar
b7886000-b7889000 r--s 00017000 08:01 217133    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/tritonus_share.jar
b7889000-b788c000 r--s 00017000 08:01 217125    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jl1.0.jar
b788c000-b788f000 r--s 0000e000 08:01 217130    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/lti-civil-no_s_w_t.jar
b788f000-b7892000 r--s 00023000 08:01 217123    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/lib/jdom.jar
b7892000-b7896000 r--s 00079000 fd:00 19514     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/jsse.jar
b7896000-b78aa000 r--s 000e2000 08:01 217112    
/media/E688E0FA88E0C9DF/Users/Perre/Downloads/fmj-20070928-0938/fmj.jar
b78aa000-b78b3000 r--s 00065000 fd:00 19435     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/ext/gnome-java-bridge.jar
b78b3000-b78e8000 rw-p 00000000 00:00 0 
b78e8000-b78ec000 r--s 00076000 fd:00 19436     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/ext/localedata.jar
b78ec000-b78f0000 r--s 0018d000 fd:00 19438     
/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/ext/pulse-java.jar
b78f0000-b78f8000 rw-s 00000000 fd:00 131435     /tmp/hsperfdata_Perre/3519
b78f8000-b78f9000 rw-p 00000000 00:00 0 
b78f9000-b78fa000 r--p 00000000 00:00 0 
b78fa000-b78fb000 rw-p 00000000 00:00 0 
bfcad000-bfcc0000 rwxp 00000000 00:00 0          [stack]
bfcc0000-bfcc2000 rw-p 00000000 00:00 0 

VM Arguments:
jvm_args: -Djava.library.path=native/linux-x86 
java_command: net.sf.fmj.ui.FmjStudio
Launcher Type: SUN_STANDARD

Environment Variables:
PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin:/home/Perre/bin
USERNAME=Perre
LD_LIBRARY_PATH=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386/server:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/i386:/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/../lib/i386
SHELL=/bin/bash
DISPLAY=:0.0

Signal Handlers:
SIGSEGV: [libjvm.so+0x5b4e50], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGBUS: [libjvm.so+0x5b4e50], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGFPE: [libjvm.so+0x49e0d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGPIPE: [libjvm.so+0x49e0d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGXFSZ: [libjvm.so+0x49e0d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGILL: [libjvm.so+0x49e0d0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGUSR1: SIG_DFL, sa_mask[0]=0x00000000, sa_flags=0x00000000
SIGUSR2: [libjvm.so+0x49d820], sa_mask[0]=0x00000000, sa_flags=0x10000004
SIGHUP: [libjvm.so+0x49fcf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGINT: [libjvm.so+0x49fcf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGTERM: [libjvm.so+0x49fcf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004
SIGQUIT: [libjvm.so+0x49fcf0], sa_mask[0]=0x7ffbfeff, sa_flags=0x10000004


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

OS:Fedora release 12 (Constantine)

uname:Linux 2.6.31.12-174.2.3.fc12.i686 #1 SMP Mon Jan 18 20:22:46 UTC 2010
i686
libc:glibc 2.11.1 NPTL 2.11.1 
rlimit: STACK 10240k, CORE 0k, NPROC 1024, NOFILE 1024, AS infinity
load average:0.34 0.33 0.33

CPU:total 2 (2 cores per cpu, 1 threads per core) family 6 model 15 stepping
13, cmov, cx8, fxsr, mmx, sse, sse2, sse3, ssse3

Memory: 4k page, physical 2060084k(883476k free), swap 4128760k(4128760k free)

vm_info: OpenJDK Server VM (14.0-b16) for linux-x86 JRE (1.6.0_0-b16), built on
Nov 12 2009 10:01:02 by "mockbuild" with gcc 4.4.2 20091027 (Red Hat 4.4.2-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 xranby at icedtea.classpath.org  Wed Feb 17 05:49:20 2010
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Wed, 17 Feb 2010 13:49:20 +0000
Subject: /hg/icedtea6: Implemented Shark host CPU feature autotuner using...
Message-ID: <hg.6dccdd4c25c7.1266414560.2873452341184383832@icedtea.classpath.org>

changeset 6dccdd4c25c7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6dccdd4c25c7
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Feb 17 14:46:46 2010 +0100

	Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.

	2010-02-17 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Implement host CPU feature
	autotuner using LLVM 2.7 APIs.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Define
	llvm/ADT/StringMap.h and llvm/System/Host.h depending on
	LLVM version. Allways define llvm/Support/CommandLine.h.


diffstat:

3 files changed, 38 insertions(+), 3 deletions(-)
ChangeLog                                          |   10 +++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    5 ++-
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   26 +++++++++++++++++++-

diffs (71 lines):

diff -r 8eb821cc2cd0 -r 6dccdd4c25c7 ChangeLog
--- a/ChangeLog	Tue Feb 16 15:54:50 2010 +0000
+++ b/ChangeLog	Wed Feb 17 14:46:46 2010 +0100
@@ -1,3 +1,13 @@ 2010-02-16  Gary Benson  <gbenson at redhat
+2010-02-17  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Implement host CPU feature
+	autotuner using LLVM 2.7 APIs.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Define llvm/ADT/StringMap.h and llvm/System/Host.h
+	depending on LLVM version.
+	Allways define llvm/Support/CommandLine.h.
+
 2010-02-16  Gary Benson  <gbenson at redhat.com>
 	
 	* contrib/jck/compile-native-code.sh: Add s390.
diff -r 8eb821cc2cd0 -r 6dccdd4c25c7 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Tue Feb 16 15:54:50 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Feb 17 14:46:46 2010 +0100
@@ -42,10 +42,11 @@
 #include <llvm/Target/TargetSelect.h>
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
-#if SHARK_LLVM_VERSION < 27
 #include <llvm/Support/CommandLine.h>
-#else
+#if SHARK_LLVM_VERSION >= 27
+#include <llvm/ADT/StringMap.h>
 #include <llvm/Support/Debug.h>
+#include <llvm/System/Host.h>
 #endif
 
 #include <map>
diff -r 8eb821cc2cd0 -r 6dccdd4c25c7 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 16 15:54:50 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Wed Feb 17 14:46:46 2010 +0100
@@ -51,8 +51,32 @@ SharkCompiler::SharkCompiler()
   // Create the memory manager
   _memory_manager = new SharkMemoryManager();
 
+#if SHARK_LLVM_VERSION >= 27
+  // Finetune LLVM for the current host CPU.
+  StringMap<bool> Features;
+  bool gotCpuFeatures = llvm::sys::getHostCPUFeatures(Features);
+  std::string cpu("-mcpu=" + llvm::sys::getHostCPUName());
+
+  std::vector<const char*> args;
+  args.push_back(""); // program name
+  args.push_back(cpu.c_str());
+
+  if(gotCpuFeatures){
+    std::string mattr("-mattr=");
+    for(StringMap<bool>::iterator I = Features.begin(),
+      E = Features.end(); I != E; ++I){
+      if(I->second){
+        std::string attr(I->first());
+        mattr+="+"+attr+",";
+      }
+    }
+    args.push_back(mattr.c_str());
+  }
+
+  args.push_back(0);  // terminator
+  cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
+
   // Create the JIT
-#if SHARK_LLVM_VERSION >= 27
   _execution_engine = ExecutionEngine::createJIT(
     _normal_context->module(),
     NULL, memory_manager(), CodeGenOpt::Default);


From xerxes at zafena.se  Wed Feb 17 05:52:11 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Wed, 17 Feb 2010 14:52:11 +0100
Subject: RFC: [patch] Shark host CPU capabilities autotuner.
In-Reply-To: <20100205104125.GA5933@shell.devel.redhat.com>
References: <4B6A0EF6.80309@zafena.se>
	<20100205104125.GA5933@shell.devel.redhat.com>
Message-ID: <4B7BF48B.7090203@zafena.se>

Gary Benson wrote:
> Xerxes R?nby wrote:
>   
>> The attached patch adds a host CPU features autotuner for Shark by using
>> new API's found in llvm 2.7.
>>
>>     * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp :
>>     (SharkCompiler::SharkCompiler): Implement host CPU feature
>>     autotuner using LLVM 2.7 APIs.
>>     * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp :
>>     Define llvm/ADT/StringMap.h and llvm/System/Host.h
>>     depending on LLVM version.
>>     Allways define llvm/Support/CommandLine.h.
>>
>> This patch will become more and more usefull over time when
>> llvm/System/Host.cpp gets filled with actual host detection code for
>> various targets.
>>     
>
> Commit away :)
>
> Cheers,
> Gary
>
>   
Ok!

Commited to icedtea6 hg trunk:
http://icedtea.classpath.org/hg/icedtea6/rev/6dccdd4c25c7

Cheers,
Xerxes


From bugzilla-daemon at icedtea.classpath.org  Wed Feb 17 15:06:35 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Wed, 17 Feb 2010 23:06:35 +0000
Subject: [Bug 179] javascript script support through rhino should not be on
	bootclasspath
Message-ID: <E1NhsyZ-00057p-GU@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         AssignedTo|unassigned at icedtea.classpath|gnu_andrew at member.fsf.org
                   |.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 andrew at icedtea.classpath.org  Wed Feb 17 15:15:54 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 17 Feb 2010 23:15:54 +0000
Subject: /hg/icedtea6: Fix a number of issues and enable the Rhino rewrit...
Message-ID: <hg.4ac1082a1626.1266448554.2873452341184383832@icedtea.classpath.org>

changeset 4ac1082a1626 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=4ac1082a1626
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 17 23:15:20 2010 +0000

	Fix a number of issues and enable the Rhino rewriter in the build.

	2010-02-17 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/179
		* ChangeLog: Remove rogue whitespace highlighted by emacs.
		* Makefile.am: (REWRITER_SRCS): Sources for class file
	rewriter. Only set RHINO_JAR when WITH_RHINO is set. Point
	to rewritten JAR file in build directory. Add rewriter and
	license to EXTRA_DIST. Make icedtea, icedtea-debug and
	icedtea-ecj depend on rewrite-rhino.stamp.
	(stamps/rewriter.stamp): Build the class file rewriter.
	(stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
	file to use the sun.org.mozilla namespace to avoid conflicts.
	(rewriter): New alias for stamps/rewriter.stamp. (rewrite-
	rhino): Likewise for stamps/rewrite-rhino.stamp.
		* patches/icedtea-rhino.patch: Copy rather than symlink the
	JAR file. Only drop the internal suffix on the javascript
	package names.
		* rewriter/com/redhat/rewriter/ClassRewriter.java: (executor):
	Use a single threaded executor when debugging is enabled.
	(tasks): Store the Futures returned by the executor for
	later checking. (main(String[])): Log what happens when
	processFile returns and handle any exceptions using Futures.
	(call()): Ensure srcDir/destDir replacement always matches
	with a trailing slash to avoid odd rewrites. Loop directory
	creation to avoid possible race issues. Increase logging and
	fix a number of issues with the rewrite:
		  * Fix off-by-one loop bug so final entry is inspected.
		  * Handle double entries which occur with 8-byte entries
	(doubles and longs): http://java.sun.com/docs/books/jvms/sec
	ond_edition/html/ClassFile.doc.html#16628


diffstat:

4 files changed, 170 insertions(+), 60 deletions(-)
ChangeLog                                       |   75 ++++++++++++++++-------
Makefile.am                                     |   61 ++++++++++++++++--
patches/icedtea-rhino.patch                     |   20 +++---
rewriter/com/redhat/rewriter/ClassRewriter.java |   74 +++++++++++++++-------

diffs (truncated from 601 to 500 lines):

diff -r 6dccdd4c25c7 -r 4ac1082a1626 ChangeLog
--- a/ChangeLog	Wed Feb 17 14:46:46 2010 +0100
+++ b/ChangeLog	Wed Feb 17 23:15:20 2010 +0000
@@ -1,3 +1,38 @@ 2010-02-17  Xerxes R??nby  <xerxes at zafen
+2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/179
+	* ChangeLog: Remove rogue whitespace highlighted
+	by emacs.
+	* Makefile.am:
+	(REWRITER_SRCS): Sources for class file rewriter.
+	Only set RHINO_JAR when WITH_RHINO is set.  Point
+	to rewritten JAR file in build directory.  Add
+	rewriter and license to EXTRA_DIST.  Make icedtea,
+	icedtea-debug and icedtea-ecj depend on rewrite-rhino.stamp.
+	(stamps/rewriter.stamp): Build the class file rewriter.
+	(stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
+	file to use the sun.org.mozilla namespace to avoid conflicts.
+	(rewriter): New alias for stamps/rewriter.stamp.
+	(rewrite-rhino): Likewise for stamps/rewrite-rhino.stamp.
+	* patches/icedtea-rhino.patch:
+	Copy rather than symlink the JAR file.  Only drop the
+	internal suffix on the javascript package names.
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	(executor): Use a single threaded executor when
+	debugging is enabled.
+	(tasks): Store the Futures returned by the executor
+	for later checking.
+	(main(String[])): Log what happens when processFile
+	returns and handle any exceptions using Futures.
+	(call()): Ensure srcDir/destDir replacement always
+	matches with a trailing slash to avoid odd rewrites.
+	Loop directory creation to avoid possible race issues.
+	Increase logging and fix a number of issues with the rewrite:
+	  * Fix off-by-one loop bug so final entry is inspected.
+	  * Handle double entries which occur with 8-byte entries
+	    (doubles and longs):
+	http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#16628
+
 2010-02-17  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
@@ -9,7 +44,7 @@ 2010-02-17  Xerxes R??nby  <xerxes at zafen
 	Allways define llvm/Support/CommandLine.h.
 
 2010-02-16  Gary Benson  <gbenson at redhat.com>
-	
+
 	* contrib/jck/compile-native-code.sh: Add s390.
 
 2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
@@ -177,7 +212,7 @@ 2010-01-27 Andrew John Hughes  <ahughes@
 	* NEWS:
 	Add missing items for 1.5.1, 1.5.2,
 	1.5.3, 1.6.1 and 1.6.2.
-	
+
 2010-01-27  Edward Nevill   <ed at camswl.com>
 
 	* ports/hotspot/src/cpu/zero/vm/thumb2.cpp
@@ -188,7 +223,7 @@ 2010-01-26  Deepak Bhole <dbhole at redhat.
 	* NEWS: Added message about alpha release for the new NPR based plugin.
 
 2010-01-27  Matthias Klose  <doko at ubuntu.com>
-	
+
 	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
 	ICEDTEA_PKG.
 
@@ -221,39 +256,39 @@ 2010-01-25 Andrew John Hughes  <ahughes@
 
 	* Makefile.am:
 	Build NPPlugin source files separately.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Fix ICEDTEAPLUGIN_TARGET to use new
 	stamp targets and remove redundant
 	ICEDTEANPPPLUGIN_TARGET.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Use NPPLUGIN_SRCDIR for Java plugin sources.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Provide stamp targets for both npplugin
 	and the old plugin so 'make plugin' builds
 	the one configured.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Remove trailing space after IcedTea version
 	in plugin version information when package
 	version is not set.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Build NPPlugin in the build directory,
 	not the source tree.
-	
+
 2010-01-22  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am:
@@ -289,7 +324,7 @@ 2010-01-25 Andrew John Hughes  <ahughes@
 	* patches/icedtea-libraries.patch:
 	Make all dlopen choices at build-time,
 	not just one.  Support libjpeg8 as well.
-	
+
 2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/433
@@ -316,7 +351,7 @@ 2010-01-21  Andrew John Hughes  <ahughes
 	* Makefile.am:
 	Fix paths to patches and IcedTeaNPPlugin.cc
 	for make dist.
-	
+
 2010-01-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
@@ -380,7 +415,7 @@ 2010-01-18 Andrew John Hughes  <ahughes@
 	* configure.ac:
 	Use AC_LANG_PUSH and AC_LANG_POP instead
 	of deprecated SAVE and RESTORE macros.
-	
+
 2010-01-18 Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/416:
@@ -388,7 +423,7 @@ 2010-01-18 Andrew John Hughes  <ahughes@
 	Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
 	to determine names of tarballs rather than
 	hardcoding openjdk.tar.gz and hotspot.tar.gz
-	
+
 2010-01-17  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
@@ -406,13 +441,13 @@ 2010-01-16 Andrew John Hughes  <ahughes@
 	(IT_FIND_NUMBER_OF_PROCESSORS):
 	Dependency of above.  Uses getconf to
 	obtain the number of available processors.
-	
+
 2010-01-16 Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
 	Send output to AS_MESSAGE_LOG_FD rather
 	than /dev/null so we have a record of errors.
-	
+
 2010-01-16 Andrew John Hughes  <ahughes at redhat.com>
 
 	configure output and option cleanup
@@ -523,7 +558,7 @@ 2010-01-11 Andrew John Hughes  <ahughes@
 
 	* patches/hotspot/hs16/memory-limits.patch:
 	Add HotSpot 16 version of memory limits patch.
-	
+
 2010-01-11 Andrew John Hughes  <ahughes at redhat.com>
 
 	Bump to latest HotSpot 16 (b13).
@@ -601,14 +636,14 @@ 2009-12-24  Deepak Bhole <dbhole at redhat.
 	using any Mozilla code) in IcedTeaPluginUtils.
 	(get_scriptable_object): Initialize handle to 0 if not already set.
 	(GCJ_SetWindow): Set proper instance id when manipulating height.
-	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Add temporary 
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc: Add temporary
 	workaround for chromium which seems to free on calls to
 	NPN_PluginThreadAsyncCall.
 	* plugin/icedteanp/IcedTeaPluginUtils.cc
 	(decodeURL): New function. Decodes an encoded URL.
 	* plugin/icedteanp/IcedTeaPluginUtils.h: Added helper macros for
 	decodeURL.
-	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Make panel 
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Make panel
 	visible only if handle is non-zero.
 	(parse): Fix regression introduced when fix for Bug# 406 was ported over.
 	Normalized default width and height.
@@ -617,7 +652,7 @@ 2009-12-24  Andrew John Hughes  <ahughes
 
 	* configure.ac: Bump version to 1.8pre.
 	* NEWS: Mention X11 fix.
-	
+
 2009-12-22  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am: Set JDK_UPDATE_VERSION based on upstream drop version
@@ -645,7 +680,7 @@ 2009-12-14  Man Lung Wong  <mwong at redhat
 2009-12-14  Man Lung Wong  <mwong at redhat.com>
 
 	* rt/net/sourceforge/jnlp/Launcher.java
-	(launch): File is not launched if offline-allowed tag not present and 
+	(launch): File is not launched if offline-allowed tag not present and
 	system offline.
 
 2009-12-13  Mark Wielaard  <mjw at redhat.com>
diff -r 6dccdd4c25c7 -r 4ac1082a1626 Makefile.am
--- a/Makefile.am	Wed Feb 17 14:46:46 2010 +0100
+++ b/Makefile.am	Wed Feb 17 23:15:20 2010 +0000
@@ -196,6 +196,8 @@ endif
 # Sources list
 
 PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
+
+REWRITER_SRCS = $(abs_top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
 
 # Patch list
 
@@ -446,7 +448,6 @@ ICEDTEA_ENV = \
 	JAVAC="" \
 	JAVA_HOME="" \
 	JDK_HOME="" \
-	RHINO_JAR="$(RHINO_JAR)" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
 	DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
 	DEBUG_CLASSFILES="true" \
@@ -482,6 +483,11 @@ if HAS_HOTSPOT_REVISION
 if HAS_HOTSPOT_REVISION
 ICEDTEA_ENV += \
 	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)" 
+endif
+
+if WITH_RHINO
+ICEDTEA_ENV += \
+	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
 endif
 
 # OpenJDK ecj build environment.
@@ -529,7 +535,6 @@ ICEDTEA_ENV_ECJ = \
 	JAVAC="" \
 	JAVA_HOME="" \
 	JDK_HOME="" \
-	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)" \
@@ -563,6 +568,11 @@ if HAS_HOTSPOT_REVISION
 if HAS_HOTSPOT_REVISION
 ICEDTEA_ENV_ECJ += \
 	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
+endif
+
+if WITH_RHINO
+ICEDTEA_ENV_ECJ += \
+	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
 endif
 
 # Source files
@@ -585,7 +595,9 @@ EXTRA_DIST = rt generated \
 	tapset/hotspot.stp.in \
 	tapset/hotspot_jni.stp.in \
 	scripts/jni_create_stap.c \
-	scripts/jni_desc
+	scripts/jni_desc \
+	rewriter/agpl-3.0.txt \
+	$(REWRITER_SRCS)
 
 # Top-Level Targets
 # =================
@@ -1226,7 +1238,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp
+	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1325,7 +1337,7 @@ stamps/icedtea-debug.stamp: stamps/boots
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp
+	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1447,7 +1459,7 @@ icedtea-debug-against-icedtea: \
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/patch-ecj.stamp stamps/cacao.stamp
+	stamps/patch-ecj.stamp stamps/cacao.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
@@ -1679,6 +1691,39 @@ endif
 endif
 
 # end of pulse-java
+
+# Rhino support
+
+stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
+if WITH_RHINO
+	(cd $(abs_top_srcdir)/rewriter ; \
+	 $(ICEDTEA_BOOT_DIR)/bin/javac -g \
+	 -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
+	)
+endif
+	mkdir -p stamps
+	touch stamps/rewriter.stamp
+
+stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
+if WITH_RHINO
+	mkdir -p rhino/rhino.{old,new}
+	(cd rhino/rhino.old ; jar xf $(RHINO_JAR))
+	$(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
+	  com.redhat.rewriter.ClassRewriter \
+	  $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
+	  org.mozilla sun.org.mozilla
+	(cd rhino/rhino.old ; \
+	 for files in `find -type f -not -name '*.class'` ; do \
+	   new_file=../rhino.new/`echo $$files|sed -e 's#org#sun/org#'` ; \
+	   mkdir -p `dirname $$new_file` ; \
+	   cp -v $$files $$new_file ; \
+	   sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \
+	 done \
+	)
+	(cd rhino/rhino.new ; jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
+endif
+	mkdir -p stamps
+	touch stamps/rewrite-rhino.stamp
 
 # VisualVM
 
@@ -2189,6 +2234,10 @@ patch-fsg: stamps/patch-fsg.stamp
 
 overlay: stamps/overlay.stamp
 
+rewriter: stamps/rewriter.stamp
+
+rewrite-rhino: stamps/rewrite-rhino.stamp
+
 plugs: stamps/plugs.stamp
 
 rt-class-files: stamps/rt-class-files.stamp
diff -r 6dccdd4c25c7 -r 4ac1082a1626 patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch	Wed Feb 17 14:46:46 2010 +0100
+++ b/patches/icedtea-rhino.patch	Wed Feb 17 23:15:20 2010 +0000
@@ -44,7 +44,7 @@
  	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
  	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
  	$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
-+	$(LN) -sf $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
++	$(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
  	@# Generate meta-index to make boot and extension class loaders lazier
  	$(CD) $(JRE_IMAGE_DIR)/lib && \
  	    $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
@@ -55,7 +55,7 @@
  package com.sun.script.javascript;
  
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import javax.script.*;
  
  /**
@@ -66,7 +66,7 @@
  import javax.script.*;
  import java.util.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import com.sun.script.util.*;
  
  /**
@@ -77,7 +77,7 @@
  
  package com.sun.script.javascript;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import javax.script.*;
  import java.util.*;
  
@@ -88,7 +88,7 @@
  import com.sun.script.util.*;
  import javax.script.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import java.lang.reflect.Method;
  import java.io.*;
  import java.util.*;
@@ -99,7 +99,7 @@
  
  import java.util.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * This class prevents script access to certain sensitive classes.
@@ -110,7 +110,7 @@
  
  import javax.script.Invocable;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * This class implements Rhino-like JavaAdapter to help implement a Java
@@ -121,7 +121,7 @@
  package com.sun.script.javascript;
  
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import java.util.*;
  
  /**
@@ -132,7 +132,7 @@
  import java.lang.reflect.*;
  import static sun.security.util.SecurityConstants.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * This wrap factory is used for security reasons. JSR 223 script
@@ -143,7 +143,7 @@
  package com.sun.script.javascript;
  import javax.script.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * Represents compiled JavaScript code.
diff -r 6dccdd4c25c7 -r 4ac1082a1626 rewriter/com/redhat/rewriter/ClassRewriter.java
--- a/rewriter/com/redhat/rewriter/ClassRewriter.java	Wed Feb 17 14:46:46 2010 +0100
+++ b/rewriter/com/redhat/rewriter/ClassRewriter.java	Wed Feb 17 23:15:20 2010 +0000
@@ -27,11 +27,15 @@ import java.io.IOException;
 
 import java.nio.charset.Charset;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import java.util.logging.ConsoleHandler;
@@ -56,15 +60,21 @@ public class ClassRewriter
   /**
    * The executor for submitting rewriting jobs.
    */
-  private static final ExecutorService executor = Executors.newCachedThreadPool();
+  private static final ExecutorService executor = DEBUG ?
+    Executors.newSingleThreadExecutor() : Executors.newCachedThreadPool();
 
   /**
    * The source directory, set once by main.
    */
   private static File srcDir;
 
+  /**
+   * The list of tasks submitted to the executor.
+   */
+  private static List<Future<Void>> tasks = new ArrayList<Future<Void>>();
+
   public static void main(String[] args)
-    throws Exception
+    throws ExecutionException, InterruptedException
   {
     if (args.length < 4)
       {
@@ -78,17 +88,15 @@ public class ClassRewriter
     handler.setLevel(level);
     logger.addHandler(handler);
     srcDir = new File(args[0]);
-    try
-      {
-        processFile(srcDir, args[1], args[2], args[3]);
-      }
-    finally
-      {
-        executor.shutdown();
-        executor.awaitTermination(1, TimeUnit.MINUTES);


From andrew at icedtea.classpath.org  Wed Feb 17 15:22:03 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 17 Feb 2010 23:22:03 +0000
Subject: /hg/icedtea6: 34 new changesets
Message-ID: <hg.3fdc1dee7f86.1266448923.2873452341184383832@icedtea.classpath.org>

changeset 3fdc1dee7f86 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3fdc1dee7f86
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Dec 02 17:58:28 2009 +0000

	Merge


changeset b00255fb507b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b00255fb507b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Dec 02 19:47:16 2009 +0000

	Support the JAXP and JAXWS drop zips now used in OpenJDK6 hg.

	2009-12-02 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add support for new JAXP and JAXWS
	drop zips. (download-jaxp-drop.stamp): New target.
	(download-jaf-drop.stamp): Likewise. (download-jaxp-
	drop.stamp): Likewise. (download-drops.stamp): Likewise.
	(clean-drops): Likewise. (clean-download-jaf-drop):
	Likewise. (clean-download-jaxp-drop): Likewise.
	(clean-download-jaxws-drop): Likewise. (download-jaxp-drop):
	New alias. (download-jaxws-drop): Likewise.
	(download-jaf-drop): Likewise.
		* acinclude.m4: (WITH_JAXP_DROP_ZIP): New options --with-jaxp-
	drop-zip to specify location of the JAXP drop.
	(WITH_JAF_DROP_ZIP): Likewise for JAF.
	(WITH_JAXWS_DROP_ZIP): And JAXWS.
		* configure.ac: Run new macros for drop zips and find the
	sha256sum tool for checking the drop zips.


changeset c13258b71d93 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c13258b71d93
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 03 10:44:49 2009 +0000

	Merge


changeset 82e80f46cafe in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=82e80f46cafe
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 01:44:23 2009 +0000

	Support b18. Uses a number of changes backported from IcedTea7.

	2009-12-22 Andrew John Hughes <ahughes at redhat.com>

	 Support b18. Add --with-tzdata-dir option, use
	updated system rt.jar rather than a fresh one to avoid the
	need for JAXP sources, remove unnecessary copying.
		* overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java,
		* patches/icedtea-jtreg-hatrun.patch,
		* patches/openjdk/6432567-debugger-socket-overflow.patch,
		* patches/security/icedtea-6631533.patch,
		* patches/security/icedtea-6632445.patch,
		* patches/security/icedtea-6636650.patch,
		* patches/security/icedtea-6657026.patch,
		* patches/security/icedtea-6657138.patch,
		* patches/security/icedtea-6664512.patch,
		* patches/security/icedtea-6822057.patch,
		* patches/security/icedtea-6824265.patch,
		* patches/security/icedtea-6861062.patch,
		* patches/security/icedtea-6862968.patch,
		* patches/security/icedtea-6863503.patch,
		* patches/security/icedtea-6864911.patch,
		* patches/security/icedtea-6872357.patch,
		* patches/security/icedtea-6872358.patch,
		* patches/security/icedtea-6874643.patch: Removed.
		* Makefile.am: Bump to b18. Change ICEDTEA_RT to point to
	rt.jar rather than rt-closed.jar. Rename ICEDTEA_COPY_DIRS
	to ICEDTEA_BOOTSTRAP_DIRS and prefix with full path. Add
	sun/applet to $(LIVECONNECT_DIR). Set SYSTEM_JDK_DIR to
	either SYSTEM_GCJ_DIR or SYSTEM_OPENJDK_DIR depending on
	configuration. Remove dead patches, add new @Override patch
	and jaxp dependency and bootver ecj patches. Set
	JAVA_TOOLS_DIR to point to ICEDTEA_BOOT_DIR/bin. Set
	DISABLE_NIMBUS, NO_DOCS and ALT_DROPS_DIR for ecj build.
	Remove dead clean-shared-objects reference. Use
	SYSTEM_JDK_DIR in place of SYSTEM_GCJ_DIR and
	SYSTEM_OPENJDK_DIR. Copy and extend system rt.jar rather
	than using both. Copy tz.properties when TZDATA_DIR is
	specified. (hotspot-tools-copy-source-files.stamp): Don't
	copy from jaxws -- no longer exists. (hotspot-tools-
	class-files.stamp): Specify system rt.jar as classpath.
	(copy-source-files.stamp): Removed. (clean-copy): Likewise.
	(rt-source-files.txt): Use BOOTSTRAP_DIRS directly. (rt-
	class-files.stamp): Specify system rt.jar as classpath.
	(rt.stamp): Update rt.jar with class files compiled by rt-
	class-files.stamp. (plugs.stamp): Create rt-closed.jar from
	class files in lib/rt. (clean-plugs): Revert to system
	rt.jar.
		* acinclude.m4: (CHECK_WITH_TZDATA_DIR): Allow a directory
	containing timezone data to be specified. Defaults to
	/usr/share/javazi.
		* configure.ac: Call CHECK_WITH_TZDATA_DIR.
		* javac.in: Use local rt.jar as bootclasspath.
		* patches/ecj/bootver.patch: Set REQUIRED_BOOT_VER to 1.5 if
	Nimbus is disabled.
		* patches/ecj/icedtea-jaxp-dependency.patch: Add JAXP classes
	to classpath when building JAXWS.
		* patches/ecj/icedtea.patch: Recreated.
		* patches/icedtea-alpha-fixes.patch: Dropped.
		* patches/icedtea-override.patch: New patch to remove
	@Override from interfaces.
		* patches/icedtea-use-system-tzdata.patch: New version which
	uses configurable datadir. As in IcedTea7.
		* patches/icedtea-xjc.patch: Changed to apply as a patch in
	the JAXWS build.
		* patches/icedtea-xml-encodinginfo.patch: Likewise, but for
	JAXP.
		* tz.properties.in: Input file for tzdata directory setting.


changeset e3b8d810bf4c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e3b8d810bf4c
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 01:47:29 2009 +0000

	Merge


changeset bc01875c7983 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bc01875c7983
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 14:40:41 2009 +0000

	Disable updating rt.jar if sun.awt.SunToolkit is available (using
	OpenJDK)

	2009-12-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (rt.stamp): Make zip updating
	dependent on LACKS_SUN_AWT_TOOLKIT.
		* acinclude.m4: (IT_CHECK_FOR_CLASS): Generic macro to check
	for any class. Takes as arguments the define and
	the name of the class.
		* configure.ac: Check for sun.awt.SunToolkit using the
	new IT_CHECK_FOR_CLASS macro.


changeset 38176ba09f2a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=38176ba09f2a
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 14:42:10 2009 +0000

	Merge


changeset 2f2a0dd6c3c7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2f2a0dd6c3c7
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Dec 24 16:49:49 2009 +0000

	Remove native2ascii workaround; no longer needed in b18.

	2009-12-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Remove native2ascii workaround, fixed
	properly in b18.


changeset 2e89df00d30f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2e89df00d30f
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Dec 28 01:33:16 2009 +0000

	Fix to build against the current OpenJDK6 forest.

	2009-12-27 Andrew John Hughes <ahughes at redhat.com>

	 * patches/ecj/icedtea-jaxp-dependency.patch:
	Recreated against current hg.
		* patches/ecj/icedtea.patch: Remove patches to jaxp and jaxws
	Makefiles and use the existing jdk.home instead of
	boot.java.home in their build.xml files.


changeset 446eebb1cb5a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=446eebb1cb5a
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Dec 28 01:34:20 2009 +0000

	Merge


changeset a59979fbe19d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a59979fbe19d
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 04 15:07:48 2010 +0000

	Drop dead symbolic link.

	2010-10-04 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Drop redundant (and broken in some
	cases) symbolic link.


changeset c64bbbcdb12a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c64bbbcdb12a
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jan 05 17:52:29 2010 +0000

	Fix building of extra-class-files.stamp when using the no-
	bootstrap/OpenJDK mode.

	2010-10-05 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Store path to rt-closed.jar in
	ICEDTEA_PLUGS variable and reference on the classpath when
	building extra-class-files.stamp.


changeset 6a5634736d60 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6a5634736d60
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jan 05 19:13:05 2010 +0000

	Merge


changeset 3a66a0c37780 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3a66a0c37780
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 08 18:30:40 2010 +0000

	Remove JDK_UPDATE_VERSION documentation patch; refined and applied
	upstream.

	2010-01-05 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-jdk-docs-target.patch: Dropped,
	refined version applied upstream.
		* Makefile.am: Remove above patch.


changeset 789ddfe105c0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=789ddfe105c0
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 08 18:31:58 2010 +0000

	Merge


changeset 2c1898b9904e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2c1898b9904e
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 09 02:04:05 2010 +0000

	Include Mercurial revisions and distro name in version output.

	2010-01-08 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Calculate JDK and HotSpot Mercurial
	revisions if available and pass to build. Also pass
	DIST_NAME to build.
		* acinclude.m4: (IT_GET_LSB_DATA): Moved from configure.ac
	and extended to also obtain the name of the distribution
	from either lsb_release -is or $build_os.
		* configure.ac: Invoke IT_GET_LSB_DATA macro.
		* patches/icedtea-version.patch: Updated to use distribution
	name and JDK and HotSpot Mercurial revision IDs.


changeset 9fa9a9ddc6f8 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9fa9a9ddc6f8
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jan 12 01:23:12 2010 +0000

	Merge


changeset fafd64b4a0a4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fafd64b4a0a4
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 16 04:25:58 2010 +0000

	Extend and adapt patches due to upstream changes.

	2010-01-16 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-liveconnect.patch: Don't quote
	JAVA_ARGS twice. (6888709: Change use of -DX=\""Y\"" to
		-DX='"Y"', consistently for all platforms)
	http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/93c580ce5e88
		* patches/icedtea-override.patch: Remove @Override on
	interface methods in OCSPResponse.java
	http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/c33ca6c539bf


changeset ce190943412e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ce190943412e
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 16 04:30:59 2010 +0000

	Merge


changeset a8247a10bcac in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a8247a10bcac
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Jan 17 19:06:56 2010 +0000

	Readd missing bracket lost in merge.

	2010-01-17 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: Re-add missing bracket removed by
	merge.


changeset 91e3d06e1283 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=91e3d06e1283
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 20 10:48:37 2010 +0000

	Merge


changeset bd1235460fae in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=bd1235460fae
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 01:57:01 2010 +0000

	Include derivative name and version (e.g IcedTea6 1.7) in crash
	dump. Obtain Mercurial revisions at configure time.

	2010-01-20 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Pass DERIVATIVE_ID and
	HOTSPOT_BUILD_VERSION to build (later only when the HotSpot
	Mercurial revision is available). (patch.stamp):
	Move revision derivation to configure.
		* acinclude.m4: (IT_GET_LSB_DATA): Report results.
	(IT_CHECK_FOR_MERCURIAL): Macro wrapper around check for hg.
	(IT_OBTAIN_HG_REVISIONS): Obtain Mercurial revisions for
	IcedTea, JDK and HotSpot if available.
		* configure.ac: Call new macros.
		* patches/icedtea-version-hotspot.patch: Updated to include
	DERIVATIVE_ID (IcedTea6 version) in the crash dump output.


changeset ac7b942245f2 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ac7b942245f2
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 21 02:04:50 2010 +0000

	Merge


changeset 30881dc8076c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=30881dc8076c
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 28 16:34:49 2010 +0000

	Merge


changeset 2e9cc3b3a882 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2e9cc3b3a882
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 28 17:33:53 2010 +0000

	Merge


changeset 7dfb8c2383c4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7dfb8c2383c4
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jan 28 17:34:31 2010 +0000

	Merge


changeset fdc603d7a29a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fdc603d7a29a
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jan 29 14:56:25 2010 +0000

	Remove patches already in icedtea6-hg.

	2010-01-29 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-6920143-using-with-mouse.patch,
		* patches/icedtea-6920172-location-relative-to-test.patch,
		* patches/icedtea-6920172-turkish.patch,
		* patches/icedtea-xml-encodinginfo.patch: Dropped, already in
	OpenJDK6 hg.
		* Makefile.am: Remove above patches.


changeset b1855c484f79 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b1855c484f79
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 21:00:53 2010 +0000

	Merge


changeset 54daa005cac0 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=54daa005cac0
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 21:01:55 2010 +0000

	Drop XShm patch -- applied upstream.

	2010-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-6897844-xshm.patch: Dropped,
	applied upstream.
		* Makefile.am: Remove above patch.


changeset 18446e8c463f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=18446e8c463f
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 22:10:30 2010 +0000

	Remove backported patch.

	2010-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-6829636-loggingdeadlock2.patch:
	Dropped; OpenJDK hg backport.
		* Makefile.am: Remove above patch.


changeset 2e45706c88ce in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2e45706c88ce
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 22:12:10 2010 +0000

	Merge


changeset 389724e2c6b5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=389724e2c6b5
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 22:13:10 2010 +0000

	Remove backported patches.

	2010-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * patches/openjdk/6716076-loggingdeadlock2.patch,
		* patches/openjdk/6912628-turkcert.patch,
		* patches/openjdk/6917663-turkish.patch,
		* patches/openjdk/6920143-using-with-mouse.patch,
		* patches/openjdk/6920172-location-relative-to-test.patch:
	Remove backported patches.


changeset 0e7eb56f320b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0e7eb56f320b
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 17 23:18:57 2010 +0000

	Bump to released b18 tarball.

	2010-02-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Bump to released b18 tarball.


changeset 76296a4bf985 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=76296a4bf985
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 17 23:21:43 2010 +0000

	Merge in changes from icedtea6-hg branch to support b18.


diffstat:

266 files changed, 25158 insertions(+), 44771 deletions(-)
.hgignore                                                                                    |    2 
.hgtags                                                                                      |    1 
ChangeLog                                                                                    | 1186 +
HACKING                                                                                      |   28 
IcedTeaPlugin.cc                                                                             |    4 
Makefile.am                                                                                  |  715 
NEWS                                                                                         |   67 
acinclude.m4                                                                                 |  759 -
configure.ac                                                                                 |  260 
contrib/checkopts/Test.java                                                                  |    5 
contrib/checkopts/checkopts                                                                  |  149 
contrib/jck/compile-native-code.sh                                                           |    3 
generated/sun/misc/Version.java                                                              |    4 
hotspot.map                                                                                  |    2 
javac.in                                                                                     |    2 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFileSoundbankReader.java     |  131 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatConverter.java          | 1058 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatFormatConverter.java    |  617 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioFloatInputStream.java        |  281 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizer.java             |  128 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/AudioSynthesizerPropertyInfo.java |   76 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/CHANGES.txt                       |  310 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInfo.java                      |  109 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSInstrument.java                |  448 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSModulator.java                 |  351 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSRegion.java                    |  150 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSample.java                    |  122 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleLoop.java                |   63 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSampleOptions.java             |   80 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbank.java                 | 1287 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/DLSSoundbankReader.java           |   74 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/EmergencySoundbank.java           | 2695 ---
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/FFT.java                          |  748 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidDataException.java         |   45 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/InvalidFormatException.java       |   44 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/JARSoundbankReader.java           |  120 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/LICENSE                           |  347 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractChannelMixer.java    |  126 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelAbstractOscillator.java      |  200 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBuffer.java              |  329 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelByteBufferWavetable.java     |  281 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelChannelMixer.java            |   50 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelConnectionBlock.java         |  135 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDestination.java             |  117 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirectedPlayer.java          |   36 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelDirector.java                |   46 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelIdentifier.java              |  169 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrument.java              |  136 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelInstrumentComparator.java    |   52 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelMappedInstrument.java        |   62 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillator.java              |   44 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelOscillatorStream.java        |   48 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPatch.java                   |   52 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelPerformer.java               |  143 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelSource.java                  |  109 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardDirector.java        |   86 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelStandardTransform.java       |  139 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelTransform.java               |   35 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/ModelWavetable.java               |   49 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/README.txt                        |  402 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidDataException.java     |   43 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFInvalidFormatException.java   |   44 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFReader.java                   |  332 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/RIFFWriter.java                   |  365 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2GlobalRegion.java              |   33 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Instrument.java                |  911 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2InstrumentRegion.java          |   43 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Layer.java                     |   78 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2LayerRegion.java               |   43 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Modulator.java                 |   97 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Region.java                    |  167 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Sample.java                    |  216 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2Soundbank.java                 |  973 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SF2SoundbankReader.java           |   73 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleInstrument.java             |  196 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SimpleSoundbank.java              |  145 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAbstractResampler.java        |  390 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioBuffer.java              |  104 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioProcessor.java           |   48 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftAudioPusher.java              |   92 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannel.java                  | 1556 --
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChannelProxy.java             |  202 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftChorus.java                   |  337 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftControl.java                  |   36 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftCubicResampler.java           |   87 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftEnvelopeGenerator.java        |  298 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftFilter.java                   |  616 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftInstrument.java               |   82 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftJitterCorrector.java          |  277 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLanczosResampler.java         |  118 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLimiter.java                  |  191 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler.java          |   70 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLinearResampler2.java         |  108 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftLowFrequencyOscillator.java   |  130 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMainMixer.java                | 1029 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMidiAudioFileReader.java      |  214 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingClip.java               |  539 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingDataLine.java           |  522 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMainMixer.java          |  259 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixer.java              |  529 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingMixerProvider.java      |   66 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftMixingSourceDataLine.java     |  519 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPerformer.java                |  775 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftPointResampler.java           |   63 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProcess.java                  |   41 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftProvider.java                 |   51 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReceiver.java                 |   83 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResampler.java                |   35 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftResamplerStreamer.java        |   38 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftReverb.java                   |  515 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftShortMessage.java             |   58 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSincResampler.java            |  139 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftSynthesizer.java              | 1179 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftTuning.java                   |  256 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/SoftVoice.java                    |  851 -
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveExtensibleFileReader.java     |  339 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileReader.java          |  166 
overlays/openjdk/jdk/src/share/classes/com/sun/media/sound/WaveFloatFileWriter.java          |  147 
overlays/openjdk/jdk/test/java/util/SimpleTimeZone/EndOfDay.java                             |   23 
patches/cacao/arm-arch-defines.patch                                                         |   47 
patches/cacao/nio2.patch                                                                     |   41 
patches/cacao/no-strict-aliasing.patch                                                       |   31 
patches/ecj/bootver.patch                                                                    |   18 
patches/ecj/icedtea-hotspot.patch                                                            |   16 
patches/ecj/icedtea-jaxp-dependency.patch                                                    |   25 
patches/ecj/icedtea.patch                                                                    |  241 
patches/hotspot/hs16/icedtea-params-cast-size_t.patch                                        |   60 
patches/hotspot/hs16/memory-limits.patch                                                     |   24 
patches/hotspot/hs16/shark.patch                                                             |    9 
patches/hotspot/original/memory-limits.patch                                                 |   23 
patches/icedtea-6897844-xshm.patch                                                           |   13 
patches/icedtea-alpha-fixes.patch                                                            |   20 
patches/icedtea-arch.patch                                                                   |   10 
patches/icedtea-bytecodeInterpreter.patch                                                    |   11 
patches/icedtea-cc-interp-backedge.patch                                                     |   30 
patches/icedtea-cc-interp-jvmti.patch                                                        |   13 
patches/icedtea-core-build-hotspot.patch                                                     |  108 
patches/icedtea-core-build.patch                                                             |   81 
patches/icedtea-ia64-bugfix.patch                                                            |   16 
patches/icedtea-ia64-fdlibm.patch                                                            |   12 
patches/icedtea-jdk-docs-target.patch                                                        |   16 
patches/icedtea-jtreg-hatrun.patch                                                           |   50 
patches/icedtea-libraries.patch                                                              |   30 
patches/icedtea-linker-options.patch                                                         |   48 
patches/icedtea-linux-separate-debuginfo.patch                                               |  379 
patches/icedtea-liveconnect.patch                                                            |   79 
patches/icedtea-memory-limits.patch                                                          |   23 
patches/icedtea-override.patch                                                               |  198 
patches/icedtea-parisc.patch                                                                 |   14 
patches/icedtea-rhino.patch                                                                  |   20 
patches/icedtea-s390-serialize.patch                                                         |   15 
patches/icedtea-sh4-support.patch                                                            |   63 
patches/icedtea-shark-build-hotspot.patch                                                    |  213 
patches/icedtea-shark-build.patch                                                            |   49 
patches/icedtea-shark.patch                                                                  |   20 
patches/icedtea-signature-iterator.patch                                                     |   44 
patches/icedtea-sparc-trapsfix.patch                                                         |   19 
patches/icedtea-static-libstdc++.patch                                                       |   16 
patches/icedtea-test-atomic-operations.patch                                                 |   25 
patches/icedtea-uname.patch                                                                  |   20 
patches/icedtea-use-system-tzdata.patch                                                      |  142 
patches/icedtea-version-hotspot.patch                                                        |   42 
patches/icedtea-version.patch                                                                |   88 
patches/icedtea-xjc.patch                                                                    |   38 
patches/icedtea-xml-encodinginfo.patch                                                       |   79 
patches/icedtea-zero-build-hotspot.patch                                                     |  129 
patches/icedtea-zero-build.patch                                                             |  205 
patches/icedtea-zero.patch                                                                   |  229 
patches/libpng.patch                                                                         |   12 
patches/openjdk/6432567-debugger-socket-overflow.patch                                       |   17 
patches/security/icedtea-6631533.patch                                                       |  184 
patches/security/icedtea-6632445.patch                                                       |  103 
patches/security/icedtea-6636650.patch                                                       |  139 
patches/security/icedtea-6657026.patch                                                       | 1609 --
patches/security/icedtea-6657138.patch                                                       |  745 
patches/security/icedtea-6664512.patch                                                       | 1227 -
patches/security/icedtea-6822057.patch                                                       |   32 
patches/security/icedtea-6824265.patch                                                       |  142 
patches/security/icedtea-6861062.patch                                                       |  344 
patches/security/icedtea-6862968.patch                                                       |   60 
patches/security/icedtea-6863503.patch                                                       |   33 
patches/security/icedtea-6864911.patch                                                       |  422 
patches/security/icedtea-6872357.patch                                                       |   17 
patches/security/icedtea-6872358.patch                                                       |  157 
patches/security/icedtea-6874643.patch                                                       |   16 
patches/zero/6890308.patch                                                                   |  760 +
patches/zero/6891677.patch                                                                   |  418 
patches/zero/6896043.patch                                                                   |  113 
patches/zero/6903453.patch                                                                   |   38 
patches/zero/6909153.patch                                                                   |   40 
patches/zero/6913869.patch                                                                   |   12 
patches/zero/6914622.patch                                                                   |   98 
platform_zero.in                                                                             |   17 
plugin/icedtea/sun/applet/PluginAppletViewer.java                                            |   38 
plugin/icedteanp/IcedTeaJavaRequestProcessor.cc                                              |  365 
plugin/icedteanp/IcedTeaJavaRequestProcessor.h                                               |   53 
plugin/icedteanp/IcedTeaNPPlugin.cc                                                          |  165 
plugin/icedteanp/IcedTeaNPPlugin.h                                                           |    9 
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc                                            |  803 -
plugin/icedteanp/IcedTeaPluginRequestProcessor.h                                             |    9 
plugin/icedteanp/IcedTeaPluginUtils.cc                                                       |  310 
plugin/icedteanp/IcedTeaPluginUtils.h                                                        |   70 
plugin/icedteanp/IcedTeaRunnable.h                                                           |    2 
plugin/icedteanp/IcedTeaScriptablePluginObject.cc                                            |  260 
plugin/icedteanp/IcedTeaScriptablePluginObject.h                                             |   14 
plugin/icedteanp/java/netscape/javascript/JSObject.java                                      |    7 
plugin/icedteanp/java/sun/applet/MethodOverloadResolver.java                                 |  139 
plugin/icedteanp/java/sun/applet/PluginAppletSecurityContext.java                            |  103 
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java                                     | 2368 +--
plugin/icedteanp/java/sun/applet/PluginCallRequestFactory.java                               |    3 
plugin/tests/LiveConnect/DummyObject.java                                                    |   15 
plugin/tests/LiveConnect/OverloadTestHelper1.java                                            |    1 
plugin/tests/LiveConnect/OverloadTestHelper2.java                                            |    1 
plugin/tests/LiveConnect/OverloadTestHelper3.java                                            |    1 
plugin/tests/LiveConnect/PluginTest.java                                                     |  710 
plugin/tests/LiveConnect/build                                                               |   18 
plugin/tests/LiveConnect/common.js                                                           |  218 
plugin/tests/LiveConnect/index.html                                                          |   91 
plugin/tests/LiveConnect/jjs_eval_test.js                                                    |   57 
plugin/tests/LiveConnect/jjs_func_parameters_tests.js                                        |  107 
plugin/tests/LiveConnect/jjs_func_rettype_tests.js                                           |   61 
plugin/tests/LiveConnect/jjs_get_tests.js                                                    |  114 
plugin/tests/LiveConnect/jjs_set_tests.js                                                    |  314 
plugin/tests/LiveConnect/jsj_func_overload_tests.js                                          |  181 
plugin/tests/LiveConnect/jsj_func_parameters_tests.js                                        |  216 
plugin/tests/LiveConnect/jsj_func_rettype_tests.js                                           |  262 
plugin/tests/LiveConnect/jsj_get_tests.js                                                    |  260 
plugin/tests/LiveConnect/jsj_set_tests.js                                                    |  318 
plugin/tests/LiveConnect/jsj_type_casting_tests.js                                           |  825 +
plugin/tests/LiveConnect/jsj_type_conversion_tests.js                                        |  825 +
ports/hotspot/build/linux/makefiles/shark.make                                               |   32 
ports/hotspot/build/linux/makefiles/zero.make                                                |   74 
ports/hotspot/make/linux/makefiles/shark.make                                                |   32 
ports/hotspot/make/linux/makefiles/zero.make                                                 |   32 
ports/hotspot/make/linux/makefiles/zeroshark.make                                            |   78 
ports/hotspot/make/linux/platform_zero.in                                                    |   17 
ports/hotspot/src/cpu/zero/vm/asm_helper.cpp                                                 |  488 
ports/hotspot/src/cpu/zero/vm/assembler_zero.hpp                                             |    5 
ports/hotspot/src/cpu/zero/vm/bytecodes_arm.def                                              | 3137 ----
ports/hotspot/src/cpu/zero/vm/cppInterpreter_arm.S                                           | 5285 +++----
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp                                        |   43 
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp                                        |    6 
ports/hotspot/src/cpu/zero/vm/entry_zero.hpp                                                 |    6 
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp                                                 |    4 
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp                                          |    5 
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp                                               |    2 
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp                                                 |    2 
ports/hotspot/src/cpu/zero/vm/thumb2.cpp                                                     | 7456 ++++++++++
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp                                     |   18 
ports/hotspot/src/share/vm/includeDB_zero                                                    |   55 
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp                                             |    7 
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp                                           |   32 
ports/hotspot/src/share/vm/shark/sharkContext.hpp                                            |    8 
rewriter/agpl-3.0.txt                                                                        |  661 
rewriter/com/redhat/rewriter/ClassRewriter.java                                              |  293 
rt/net/sourceforge/jnlp/JNLPFile.java                                                        |   11 
rt/net/sourceforge/jnlp/Launcher.java                                                        |   23 
rt/net/sourceforge/jnlp/Parser.java                                                          |   28 
rt/net/sourceforge/jnlp/runtime/ApplicationInstance.java                                     |   31 
rt/net/sourceforge/jnlp/runtime/Boot.java                                                    |    5 
rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java                                         |   75 
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java                                     |    2 
rt/net/sourceforge/jnlp/util/XDesktopEntry.java                                              |    5 
tapset/jstack.stp.in                                                                         |  503 
tz.properties.in                                                                             |    1 
}                                                                                            |    3 

diffs (truncated from 76695 to 500 lines):

diff -r ac0296b09732 -r 76296a4bf985 .hgignore
--- a/.hgignore	Mon Nov 23 13:38:58 2009 +0000
+++ b/.hgignore	Wed Feb 17 23:21:43 2010 +0000
@@ -31,7 +31,6 @@ rt-source-files.txt
 rt-source-files.txt
 hotspot-tools-source-files.txt
 tools-source-files.txt
-platform_zero
 jvm.cfg
 ergo.c
 tapset/hotspot.stp
@@ -470,3 +469,4 @@ pulse-java.jar
 pulse-java.jar
 hotspot.tar.gz
 ports/hotspot/src/cpu/zero/vm/bytecodes_arm.s
+plugin/tests/LiveConnect/*jar
diff -r ac0296b09732 -r 76296a4bf985 .hgtags
--- a/.hgtags	Mon Nov 23 13:38:58 2009 +0000
+++ b/.hgtags	Wed Feb 17 23:21:43 2010 +0000
@@ -16,3 +16,4 @@ 07de70c5883a637ea2ef4aba3f8472edd7e12f1e
 07de70c5883a637ea2ef4aba3f8472edd7e12f1e icedtea6-1.5rc2
 926c38e2b2830971f6ca0dff2ce25f78a694b178 icedtea6-1.5rc3
 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint
+8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea-1.7-branchpoint
diff -r ac0296b09732 -r 76296a4bf985 ChangeLog
--- a/ChangeLog	Mon Nov 23 13:38:58 2009 +0000
+++ b/ChangeLog	Wed Feb 17 23:21:43 2010 +0000
@@ -1,3 +1,1189 @@ 2009-11-23  Andrew John Hughes  <ahughes
+2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Bump to released b18 tarball.
+
+2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/179
+	* ChangeLog: Remove rogue whitespace highlighted
+	by emacs.
+	* Makefile.am:
+	(REWRITER_SRCS): Sources for class file rewriter.
+	Only set RHINO_JAR when WITH_RHINO is set.  Point
+	to rewritten JAR file in build directory.  Add
+	rewriter and license to EXTRA_DIST.  Make icedtea,
+	icedtea-debug and icedtea-ecj depend on rewrite-rhino.stamp.
+	(stamps/rewriter.stamp): Build the class file rewriter.
+	(stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
+	file to use the sun.org.mozilla namespace to avoid conflicts.
+	(rewriter): New alias for stamps/rewriter.stamp.
+	(rewrite-rhino): Likewise for stamps/rewrite-rhino.stamp.
+	* patches/icedtea-rhino.patch:
+	Copy rather than symlink the JAR file.  Only drop the
+	internal suffix on the javascript package names.
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	(executor): Use a single threaded executor when
+	debugging is enabled.
+	(tasks): Store the Futures returned by the executor
+	for later checking.
+	(main(String[])): Log what happens when processFile
+	returns and handle any exceptions using Futures.
+	(call()): Ensure srcDir/destDir replacement always
+	matches with a trailing slash to avoid odd rewrites.
+	Loop directory creation to avoid possible race issues.
+	Increase logging and fix a number of issues with the rewrite:
+	  * Fix off-by-one loop bug so final entry is inspected.
+	  * Handle double entries which occur with 8-byte entries
+	    (doubles and longs):
+	http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#16628
+
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/openjdk/6716076-loggingdeadlock2.patch,
+	* patches/openjdk/6912628-turkcert.patch,
+	* patches/openjdk/6917663-turkish.patch,
+	* patches/openjdk/6920143-using-with-mouse.patch,
+	* patches/openjdk/6920172-location-relative-to-test.patch:
+	Remove backported patches.
+
+2010-02-17  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Implement host CPU feature
+	autotuner using LLVM 2.7 APIs.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Define llvm/ADT/StringMap.h and llvm/System/Host.h
+	depending on LLVM version.
+	Allways define llvm/Support/CommandLine.h.
+
+2010-02-16  Gary Benson  <gbenson at redhat.com>
+
+	* contrib/jck/compile-native-code.sh: Add s390.
+
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-6829636-loggingdeadlock2.patch:
+	Dropped; OpenJDK hg backport.
+	* Makefile.am: Remove above patch.
+
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-6829636-loggingdeadlock2.patch,
+	* patches/icedtea-6912628-turkcert.patch,
+	* patches/icedtea-6920143-using-with-mouse.patch,
+	* patches/icedtea-6920172-location-relative-to-test.patch,
+	* patches/icedtea-6920172-turkish.patch:
+	Moved.
+	* Makefile.am: Use new patch paths.
+	* patches/openjdk/6716076-loggingdeadlock2.patch,
+	* patches/openjdk/6912628-turkcert.patch,
+	* patches/openjdk/6917663-turkish.patch,
+	* patches/openjdk/6920143-using-with-mouse.patch,
+	* patches/openjdk/6920172-location-relative-to-test.patch:
+	Move OpenJDK patches to appropriate directory and use
+	correct bug IDs for loggingdeadlock2 and turkish.
+
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-6897844-xshm.patch:
+	Dropped, applied upstream.
+	* Makefile.am: Remove above patch.
+
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* rewriter/agpl-3.0.txt,
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	Add class rewriter for fixing Rhino classes
+	to use the com.sun.org.mozilla namespace,
+	along with corresponding license.
+
+2010-02-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
+	(CppInterpreter::result_type_of): New method.
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::result_type_of): Likewise.
+	(CppInterpreter::main_loop): Use the above.
+	(CppInterpreter::native_entry): Likewise.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(os::is_allocatable): s/AMD64/_LP64/.
+
+2010-02-12  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Strip stupid options that llvm-config supplies.
+
+2010-02-09  Edward Nevill <ed at camswl.com>
+
+	* cppInterpreter_arm.S / thumb2.cpp
+	Make Thumb2 JIT the default build
+
+2010-02-03  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/IcedTeaNPPlugin.cc 
+	(plugin_create_applet_tag): Encode new lines, carriage returns, and other
+	special characters before sending them to Java side (de-coding code is
+	already in effect on Java side).
+
+2010-02-03 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* patches/icedtea-6829636-loggingdeadlock2.patch
+	Fix for Sun bug: 6829636: test case correction
+	test/java/util/logging/loggingdeadlock2.java
+
+2010-02-02  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/tests/LiveConnect/PluginTest.java
+	(jjsEvalTest): New function. Calls JSObject.eval() with given string.
+	* plugin/tests/LiveConnect/common.js: Added eval test suite as one of the
+	run options.
+	* plugin/tests/LiveConnect/index.html: Same.
+	* plugin/tests/LiveConnect/jjs_eval_test.js: Eval tests.
+
+2010-02-02  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Re-designed frame
+	embedding code so that the applet is dynamically packed into given handle.
+
+2010-02-02 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patches.
+	* patches/icedtea-6912628-turkcert.patch:
+	Fix for Sun bug: 6912628: test case correction
+	test/java/util/jar/JarFile/TurkCert.java cannot be run in
+	samevm mode. Added tag to run this test in othervm
+
+2010-02-02  Edward Nevill <ed at camswl.com>
+
+	* asm_helper.cpp, cppInterpreter_arm.S, thumb2.cpp, bytecodes_arm.def
+	Several bug fixes to compiled exection handling methods.
+	Copyright notices updated to 2010 and added to thumb2.cpp
+	Assertions turned off in PRODUCT build
+	Compilation summary and stats to stderr instead of stdout
+
+2010-02-01  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Use sharkContext::module
+	instead of sharkContext::module_provider when using LLVM 2.7
+	to handle LLVM r94686 API change.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp
+	(sharkContext::module): Made public when using LLVM 2.7.
+	(sharkContext::module_provider): Undefine when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
+	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.
+
+2010-01-29 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-6920143-using-with-mouse.patch,
+	* patches/icedtea-6920172-location-relative-to-test.patch,
+	* patches/icedtea-6920172-turkish.patch,
+	* patches/icedtea-xml-encodinginfo.patch:
+	Dropped, already in OpenJDK6 hg.
+	* Makefile.am: Remove above patches.
+
+2010-01-29 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add INITIAL_BOOTSTRAP_LINK_STAMP
+	to avoid the need to check for bootstrap/jdk1.6.0
+	on each javac or jar invocation.
+
+2010-01-29 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add ICEDTEANPPLUGIN_TARGET
+	back as a dependency of icedtea and icedtea-debug.
+
+2010-01-28 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patches.
+	* patches/icedtea-6920143-using-with-mouse.patch:
+	Fix for Sun bug 6920143: added small delay to make
+	sure that TextArea animation have finished
+	* patches/icedtea-6920172-location-relative-to-test.patch:
+	Fix for Sun bug 6920172: test case correction. Check
+	frame position against graphics environment's
+	center point
+	* patches/icedtea-6920172-turkish.patch:
+	Added othervm flag to ensure that this test will run
+	in isolation
+
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Use one general
+	stamps/plugin.stamp to mark plugin
+	installation as in IcedTea7.  Add
+	matching clean-plugin target.
+
+2010-01-28  Edward Nevill   <ed at camswl.com>
+
+	* asm_helper.cpp, cppInterpreter_arm.S, thumb2.cpp
+	Add stack checking in JIT code, fix IllegalMonitorException bug,
+	make compilation MP safe, fix bug with large no. of locals,
+	added buffer checking on compile buffer, fix large tableswitch bug,
+	fix byte accessor bug, add opc_return_register_finalizer.
+
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Reference plugin
+	directory by absolute path in EXTRA_DIST
+	to avoid confusion with build rule.
+	
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Updated for 1.7 release.
+	
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+	
+	* HACKING: Document new patch.
+	* Makefile.am: Add new patch.
+	* patches/libpng.patch:
+	Patch splashscreen code so that
+	it will build against libpng 1.4
+	(png_check_sig --> png_sig_cmp)
+
+2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS:
+	Add missing items for 1.5.1, 1.5.2,
+	1.5.3, 1.6.1 and 1.6.2.
+
+2010-01-27  Edward Nevill   <ed at camswl.com>
+
+	* ports/hotspot/src/cpu/zero/vm/thumb2.cpp
+	Forgot to do hg add on this file in my last commit
+
+2010-01-26  Deepak Bhole <dbhole at redhat.com>
+
+	* NEWS: Added message about alpha release for the new NPR based plugin.
+
+2010-01-27  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
+	ICEDTEA_PKG.
+
+2010-01-26 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(stamps/plugin-tests.stamp): Add
+	a target for building the plugin tests.
+	(plugin-tests): Alias for the above.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(IT_CHECK_OLD_PLUGIN): New macro for
+	--enable/disable-plugin.
+	(IT_CHECK_NEW_PLUGIN): Likewise for
+	--enable/disable-npplugin.
+	(IT_CHECK_PLUGIN_DEPENDENCIES): New macro
+	to run pkg-config checks.  Enables the new
+	plugin if xulrunner 1.9.2 or above is
+	detected.
+	(IT_CHECK_XULRUNNER_VERSION): Obtain the
+	XULrunner vgersion for MOZILLA_VERSION_COLLAPSED.
+	* configure.ac:
+	Replace old plugin stuff with a single call
+	to IT_CHECK_XULRUNNER_VERSION (which depends
+	on the other macros).
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Build NPPlugin source files separately.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Fix ICEDTEAPLUGIN_TARGET to use new
+	stamp targets and remove redundant
+	ICEDTEANPPPLUGIN_TARGET.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Use NPPLUGIN_SRCDIR for Java plugin sources.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Provide stamp targets for both npplugin
+	and the old plugin so 'make plugin' builds
+	the one configured.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Remove trailing space after IcedTea version
+	in plugin version information when package
+	version is not set.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Build NPPlugin in the build directory,
+	not the source tree.
+
+2010-01-22  Deepak Bhole <dbhole at redhat.com>
+
+	* Makefile.am:
+	Use MOZILLA_CFLAGS/LIBS rather than
+	XULRUNNER.
+	* configure.ac:
+	Check for Mozilla not XULrunner.
+	Bring in libxul-unstable as well.
+	* plugin/icedteanp/IcedTeaNPPlugin.cc:
+	Use PRInt32 rather than PRInt32_t for port.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* IcedTeaPlugin.cc:
+	Standardise plugin versioning.
+	* Makefile.am:
+	Set ICEDTEA_NAME and use in place of literal
+	"IcedTea6".  Use HAS_PKGVERSION to set ICEDTEA_PKG
+	and output DISTRO_PACKAGE_VERSION rather than
+	running test.  Set PLUGIN_VERSION and use for
+	both plugins.
+	* acinclude.m4:
+	(IT_GET_PKGVERSION): Moved from configure.ac and
+	changed to a macro with output.
+	(IT_GET_LSB_DATA): Depend on IT_GET_PKGVERSION.
+	* configure.ac:
+	Invoke new IT_GET_PKGVERSION macro.
+	* plugin/icedteanp/IcedTeaNPPlugin.cc:
+	Standardise plugin versioning.
+
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-libraries.patch:
+	Make all dlopen choices at build-time,
+	not just one.  Support libjpeg8 as well.
+
+2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/433
+	* Makefile.am:
+	Add set -e to tarball extractions so
+	that they fail immediately.
+
+2010-01-21  Edward Nevill   <ed at camswl.com>
+
+	* zeroshark.make, asm_helper.cpp, bytecodes_arm.def,
+	cppInterpreter_arm.S, thumb2.cpp (new file)
+	Added Thumb2 JIT (not build as default - yet)
+	Removal of, more, hard coded constants
+	Move 'complex' bytecodes from cppInterpreter_arm.S to asm_helper.cpp
+	General tidying up of cppInterpreter_arm.S
+
+2010-01-21  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am: Don't hide errors in statement sequences building
+	the NPPlugin. Use ICEDTEA_REV to defined PLUGIN_VERSION.
+
+2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Fix paths to patches and IcedTeaNPPlugin.cc
+	for make dist.
+
+2010-01-20  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Pass DERIVATIVE_ID and HOTSPOT_BUILD_VERSION
+	to build (later only when the HotSpot Mercurial
+	revision is available).
+	(patch.stamp): Move revision derivation to configure.
+	* acinclude.m4:
+	(IT_GET_LSB_DATA): Report results.
+	(IT_CHECK_FOR_MERCURIAL): Macro wrapper around check for hg.
+	(IT_OBTAIN_HG_REVISIONS): Obtain Mercurial revisions for
+	IcedTea, JDK and HotSpot if available.
+	* configure.ac:
+	Call new macros.
+	* patches/icedtea-version-hotspot.patch:
+	Updated to include DERIVATIVE_ID (IcedTea6 version)
+	in the crash dump output.
+
+2010-01-20  Xerxes R??nby  <xerxes at zafena.se>
+
+	PR icedtea/431:
+	* Makefile.am:
+	Create a link from client to server after CACAO install
+	to make openjdk find the expected client dir on 32bit systems.
+
+2010-01-08  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Calculate JDK and HotSpot Mercurial revisions
+	if available and pass to build.  Also pass
+	DIST_NAME to build.
+	* acinclude.m4:
+	(IT_GET_LSB_DATA): Moved from configure.ac
+	and extended to also obtain the name of
+	the distribution from either lsb_release -is
+	or $build_os.
+	* configure.ac:
+	Invoke IT_GET_LSB_DATA macro.
+	* patches/icedtea-version.patch:
+	Updated to use distribution name and JDK and
+	HotSpot Mercurial revision IDs.
+
+2010-01-19 Man Lung Wong  <mwong at redhat.com>
+
+	* rt/net/sourceforge/jnlp/JNLPFile.java
+	(parse): Added a default value for sourceLocation to make sure it is
+	not null (location is never null).
+	* rt/net/sourceforge/jnlp/Parser.java:
+	Removed variable base, and replaced it with codebase. The fix ended
+	with base the same as codebase, hence no longer needed. Otherwise,
+	netx will launch a jnlp file with codebase null and href not 
+	null (not the way sun's webstart behaves).
+	* rt/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
+	(setSecurity): Added a variable codebase, which gets the value of
+	codebae attribute in the jnlp file ifit exists. Otherwise, it gets
+	the value of the location of main jar resource (which needs to be
+	changed to the codebase portion instead of the entire location).
+
+2010-01-18 Andrew John Hughes  <ahughes at redhat.com>
+
+	* configure.ac:
+	Use AC_LANG_PUSH and AC_LANG_POP instead
+	of deprecated SAVE and RESTORE macros.
+
+2010-01-18 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/416:
+	* Makefile.am:
+	Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
+	to determine names of tarballs rather than
+	hardcoding openjdk.tar.gz and hotspot.tar.gz
+
+2010-01-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	Re-add missing bracket removed by merge.
+
+2010-01-16 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-liveconnect.patch:
+	Don't quote JAVA_ARGS twice.
+	(6888709: Change use of -DX=\""Y\"" to
+	-DX='"Y"', consistently for all platforms)


From gnu_andrew at member.fsf.org  Wed Feb 17 15:30:33 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 17 Feb 2010 23:30:33 +0000
Subject: IcedTea6 changes -- be prepared!
Message-ID: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>

I've just pushed the necessary Makefile changes to enable the Rhino
rewriter and fix
http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
This also coincided with the release of b18, which is now supported by
IcedTea6 via the import of the changesets from the icedtea6-hg branch.

Both have been well-tested (the latter over the last three months of
work on b18), but please report any issues you may have building the
newly updated IcedTea6.

Happy hacking,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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  Thu Feb 18 02:18:20 2010
From: mark at klomp.org (Mark Wielaard)
Date: Thu, 18 Feb 2010 11:18:20 +0100
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
Message-ID: <1266488301.2327.6.camel@hermans.wildebeest.org>

On Wed, 2010-02-17 at 23:30 +0000, Andrew John Hughes wrote:
> I've just pushed the necessary Makefile changes to enable the Rhino
> rewriter and fix
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
> This also coincided with the release of b18, which is now supported by
> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
> 
> Both have been well-tested (the latter over the last three months of
> work on b18), but please report any issues you may have building the
> newly updated IcedTea6.

On a Fedora 12 x86 machine I am getting the following with a
simple ./autogen.sh && ./configure && make:

[...]
mkdir -p lib/rt
/home/mark/src/icedtea6/bootstrap/jdk1.6.0/bin/javac  -g -d lib/rt \
          -source 1.5 \
          -sourcepath \
            'openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openj
dk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/
share/classes:openjdk/jaxws/src/share/classes:/home/mark/src/icedtea6/generated'
 \
          -classpath /usr/lib/jvm/java-gcj/jre/lib/rt.jar \
          -bootclasspath \'\' @rt-source-files.txt ;
incorrect classpath: ''
incorrect classpath: openjdk/jaxp/src/share/classes
incorrect classpath: openjdk/jaxws/src/share/classes
----------
1. ERROR in /home/mark/src/icedtea6/openjdk/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java (at line 55)
        public interface ThreadStartEvent extends Event {
                         ^^^^^^^^^^^^^^^^
The type ThreadStartEvent is already defined
[... lot of similar errors ...]
540. ERROR in /home/mark/src/icedtea6/openjdk/jdk/src/share/classes/javax/script/Invocable.java (at line 36)
        public interface Invocable  {
                         ^^^^^^^^^
The type Invocable is already defined
----------
540 problems (540 errors)make: *** [stamps/rt-class-files.stamp] Error 255

I assume the 'incorrect classpath' warnings above are the problem.

Also the autobuilder (which does a builddir != srcdir build) has a bit
of a problem with corba relying on some Unsafe methods:
http://icedtea.classpath.org/pipermail/testresults/2010-February/000294.html
Full logs at: http://icedtea.classpath.org/builds/icedtea6/
But it is somewhat harder to see when that started since the autobuilder
had a hickup since Fosdem and was only kicked into action today again.

Cheers,

Mark



From gnu_andrew at member.fsf.org  Thu Feb 18 04:35:16 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 18 Feb 2010 12:35:16 +0000
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <1266488301.2327.6.camel@hermans.wildebeest.org>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
	<1266488301.2327.6.camel@hermans.wildebeest.org>
Message-ID: <17c6771e1002180435r7cd9cba0m8985f26fefeb0d62@mail.gmail.com>

On 18 February 2010 10:18, Mark Wielaard <mark at klomp.org> wrote:
> On Wed, 2010-02-17 at 23:30 +0000, Andrew John Hughes wrote:
>> I've just pushed the necessary Makefile changes to enable the Rhino
>> rewriter and fix
>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
>> This also coincided with the release of b18, which is now supported by
>> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
>>
>> Both have been well-tested (the latter over the last three months of
>> work on b18), but please report any issues you may have building the
>> newly updated IcedTea6.
>
> On a Fedora 12 x86 machine I am getting the following with a
> simple ./autogen.sh && ./configure && make:
>
> [...]
> mkdir -p lib/rt
> /home/mark/src/icedtea6/bootstrap/jdk1.6.0/bin/javac ?-g -d lib/rt \
> ? ? ? ? ?-source 1.5 \
> ? ? ? ? ?-sourcepath \
> ? ? ? ? ? ?'openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openj
> dk/langtools/src/share/classes:openjdk/jaxp/src/share/classes:openjdk/corba/src/
> share/classes:openjdk/jaxws/src/share/classes:/home/mark/src/icedtea6/generated'
> ?\
> ? ? ? ? ?-classpath /usr/lib/jvm/java-gcj/jre/lib/rt.jar \
> ? ? ? ? ?-bootclasspath \'\' @rt-source-files.txt ;
> incorrect classpath: ''
> incorrect classpath: openjdk/jaxp/src/share/classes
> incorrect classpath: openjdk/jaxws/src/share/classes
> ----------
> 1. ERROR in /home/mark/src/icedtea6/openjdk/jdk/src/share/classes/com/sun/jdi/event/ThreadStartEvent.java (at line 55)
> ? ? ? ?public interface ThreadStartEvent extends Event {
> ? ? ? ? ? ? ? ? ? ? ? ? ^^^^^^^^^^^^^^^^
> The type ThreadStartEvent is already defined
> [... lot of similar errors ...]
> 540. ERROR in /home/mark/src/icedtea6/openjdk/jdk/src/share/classes/javax/script/Invocable.java (at line 36)
> ? ? ? ?public interface Invocable ?{
> ? ? ? ? ? ? ? ? ? ? ? ? ^^^^^^^^^
> The type Invocable is already defined
> ----------
> 540 problems (540 errors)make: *** [stamps/rt-class-files.stamp] Error 255
>
> I assume the 'incorrect classpath' warnings above are the problem.
>
> Also the autobuilder (which does a builddir != srcdir build) has a bit
> of a problem with corba relying on some Unsafe methods:
> http://icedtea.classpath.org/pipermail/testresults/2010-February/000294.html
> Full logs at: http://icedtea.classpath.org/builds/icedtea6/
> But it is somewhat harder to see when that started since the autobuilder
> had a hickup since Fosdem and was only kicked into action today again.
>

JAXWS and JAXP are no longer in the OpenJDK tarball.  Hence the
bootstrapping changes.

I'll have a look and see if I can replicate these errors later today.

> Cheers,
>
> Mark
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 ptisnovs at redhat.com  Thu Feb 18 04:49:52 2010
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Thu, 18 Feb 2010 13:49:52 +0100
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
Message-ID: <4B7D3770.9020402@redhat.com>

Andrew John Hughes wrote:
> I've just pushed the necessary Makefile changes to enable the Rhino
> rewriter and fix
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
> This also coincided with the release of b18, which is now supported by
> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
> 
> Both have been well-tested (the latter over the last three months of
> work on b18), but please report any issues you may have building the
> newly updated IcedTea6.
> 
> Happy hacking,

Hi Andrew,

is it possible to make copy of JAXWS and JAXP zips on some of our HTTP 
servers (openjdk.org...)?

I'm afraid JAXWS and JAXP sites (especially kenai.com) are overloaded.

Pavel


From gnu_andrew at member.fsf.org  Thu Feb 18 08:08:41 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 18 Feb 2010 16:08:41 +0000
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <4B7D3770.9020402@redhat.com>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
	<4B7D3770.9020402@redhat.com>
Message-ID: <17c6771e1002180808v4adc4e84jaedcb5a45f7734ba@mail.gmail.com>

On 18 February 2010 12:49, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
> Andrew John Hughes wrote:
>>
>> I've just pushed the necessary Makefile changes to enable the Rhino
>> rewriter and fix
>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
>> This also coincided with the release of b18, which is now supported by
>> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
>>
>> Both have been well-tested (the latter over the last three months of
>> work on b18), but please report any issues you may have building the
>> newly updated IcedTea6.
>>
>> Happy hacking,
>
> Hi Andrew,
>
> is it possible to make copy of JAXWS and JAXP zips on some of our HTTP
> servers (openjdk.org...)?
>
> I'm afraid JAXWS and JAXP sites (especially kenai.com) are overloaded.

openjdk.org isn't ours, it's Oracle's...

One solution is to not download for every build but download once and
use the --with-jaxp-drop-zip/--with-jaxws-drop-zip to reference them.
This is how I do builds.

>
> Pavel
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 andrew at icedtea.classpath.org  Thu Feb 18 11:31:10 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 18 Feb 2010 19:31:10 +0000
Subject: /hg/icedtea6: Explicitly compile sun.misc.Unsafe.
Message-ID: <hg.d45442addd83.1266521470.2873452341184383832@icedtea.classpath.org>

changeset d45442addd83 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d45442addd83
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 18 19:31:00 2010 +0000

	Explicitly compile sun.misc.Unsafe.

	2010-02-17 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Remove dead JAXWS and JAXP
	sourcepaths. Add sun.misc.Unsafe explicitly to ensure
	it is compiled as a bootstrap class.


diffstat:

2 files changed, 15 insertions(+), 1 deletion(-)
ChangeLog   |    7 +++++++
Makefile.am |    9 ++++++++-

diffs (47 lines):

diff -r 76296a4bf985 -r d45442addd83 ChangeLog
--- a/ChangeLog	Wed Feb 17 23:21:43 2010 +0000
+++ b/ChangeLog	Thu Feb 18 19:31:00 2010 +0000
@@ -1,3 +1,10 @@ 2010-02-17 Andrew John Hughes  <ahughes@
+2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Remove dead JAXWS and JAXP sourcepaths.
+	Add sun.misc.Unsafe explicitly to ensure
+	it is compiled as a bootstrap class.
+
 2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 76296a4bf985 -r d45442addd83 Makefile.am
--- a/Makefile.am	Wed Feb 17 23:21:43 2010 +0000
+++ b/Makefile.am	Thu Feb 18 19:31:00 2010 +0000
@@ -66,7 +66,7 @@ JAXWS = openjdk/jaxws/src/share/classes
 # FIXME (netx): NetX source directories go here
 
 OPENJDK_SOURCEPATH_DIRS = \
-        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+        $(SHARE):$(SOLARIS):$(LANGTOOLS):$(CORBA)
 
 ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
 
@@ -86,6 +86,9 @@ ICEDTEA_BOOTSTRAP_DIRS = \
 	$(SHARE)/javax/script \
 	$(SHARE)/javax/security/auth/kerberos \
 	$(SHARE)/javax/security/sasl
+
+ICEDTEA_BOOTSTRAP_CLASSES = \
+	$(SHARE)/sun/misc/Unsafe.java
 
 # FIXME (javac): Settings for javac go here
 
@@ -2192,6 +2195,10 @@ rt-source-files.txt: stamps/replace-hots
 	do \
 	  $(FIND) $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
 	done
+	for files in $(ICEDTEA_BOOTSTRAP_CLASSES) ; \
+	do \
+	  echo $$files >> $@ ; \
+	done
 
 stamps/rt-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) rt-source-files.txt
 	mkdir -p lib/rt


From bugzilla-daemon at icedtea.classpath.org  Thu Feb 18 12:34:59 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Thu, 18 Feb 2010 20:34:59 +0000
Subject: [Bug 261] java.nio.channels.spi.SelectorProvider.provider() fails
	with -verify
Message-ID: <E1NiD5P-0004Ic-Ua@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|IcedTea6                    |Zero
           Platform|other                       |all




-- 
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 andrew at icedtea.classpath.org  Thu Feb 18 14:02:37 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 18 Feb 2010 22:02:37 +0000
Subject: /hg/icedtea6: Remove hotspot-tools build to simplify bootstrapping.
Message-ID: <hg.a47b53c08a6a.1266530557.2873452341184383832@icedtea.classpath.org>

changeset a47b53c08a6a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a47b53c08a6a
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 18 22:02:18 2010 +0000

	Remove hotspot-tools build to simplify bootstrapping. Explicitly
	create the destination directory for the class rewriter.

	2010-02-17 Andrew John Hughes <ahughes at redhat.com>

	 Drop hotspot-tools targets to simplify bootstrapping
	OpenJDK.
		* Makefile.am: Add additional OPENJDK_BOOTSTRAP_DIRS
	to compensate for the removal of the hotspot-tools classes.
	Add OPENJDK_TREE variable as a pseudo-target for targets
	that require a patched OpenJDK tree with Zero, Shark and any
	overlays. Remove hotspot-tools aliases. Remove tools-copy
	from EXTRA_DIST. (distclean-local): No more need to remove
	hotspot-tools and hotspot-tools-source-files.txt.
	(extract-ecj.stamp): Depend on OPENJDK_TREE. (bootstrap-
	directory-ecj.stamp): Always create the ecj tools.jar as a
	symlink to rt.jar to appease the HotSpot build.
	(icedtea.stamp): Use OPENJDK_TREE in place of patch, overlay
	and ports (it implies all three). (icedtea-debug.stamp):
	Likewise. (icedtea-ecj.stamp): Likewise. (hotspot-
	helper): Drop hotspot-tools dependency. (rewriter.stamp):
	Explicitly create destination directory as Sun's javac
	doesn't. (cacao.stamp): Depend on OPENJDK_TREE.
	(hotspot-tools-copy-source-files.stamp): Removed. (hotspot-
	tools-source-files.txt): Removed. (hotspot-tools-class-
	files.stamp): Removed. (clean-hotspot-tools): Removed.
	(hotspot-tools.stamp): Removed. (rt-source-files.txt):
	Depend on OPENJDK_TREE. (rt.stamp): Simplify use of jar.
	(bootstrap/jdk1.7.0/jre/lib/tools.jar): Create symlink
	rather than a separate jar file. (clean-tools-jar): Remove
	hotspot-tools stuff. (plugs.stamp): Depend on tools.jar
		* tools-copy/tools-corba-copy-files.txt,
		* tools-copy/tools-jaxws-copy-files.txt,
		* tools-copy/tools-jdk-copy-files.txt,
		* tools-copy/tools-langtools-copy-files.txt: Removed.


diffstat:

6 files changed, 89 insertions(+), 318 deletions(-)
ChangeLog                                 |   43 +++++++
Makefile.am                               |  167 +++++++----------------------
tools-copy/tools-corba-copy-files.txt     |    6 -
tools-copy/tools-jaxws-copy-files.txt     |  101 -----------------
tools-copy/tools-jdk-copy-files.txt       |   39 ------
tools-copy/tools-langtools-copy-files.txt |   51 --------

diffs (truncated from 567 to 500 lines):

diff -r d45442addd83 -r a47b53c08a6a ChangeLog
--- a/ChangeLog	Thu Feb 18 19:31:00 2010 +0000
+++ b/ChangeLog	Thu Feb 18 22:02:18 2010 +0000
@@ -1,3 +1,46 @@ 2010-02-17 Andrew John Hughes  <ahughes@
+2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	Drop hotspot-tools targets to simplify
+	bootstrapping OpenJDK.
+	* Makefile.am:
+	Add additional OPENJDK_BOOTSTRAP_DIRS
+	to compensate for the removal of the
+	hotspot-tools classes.  Add OPENJDK_TREE
+	variable as a pseudo-target for targets
+	that require a patched OpenJDK tree with
+	Zero, Shark and any overlays.  Remove hotspot-tools
+	aliases.  Remove tools-copy from EXTRA_DIST.
+	(distclean-local): No more need to remove hotspot-tools
+	and hotspot-tools-source-files.txt.
+	(extract-ecj.stamp): Depend on OPENJDK_TREE.
+	(bootstrap-directory-ecj.stamp): Always create
+	the ecj tools.jar as a symlink to rt.jar to
+	appease the HotSpot build.
+	(icedtea.stamp): Use OPENJDK_TREE in place of
+	patch, overlay and ports (it implies all three).
+	(icedtea-debug.stamp): Likewise.
+	(icedtea-ecj.stamp): Likewise.
+	(hotspot-helper): Drop hotspot-tools dependency.
+	(rewriter.stamp): Explicitly create destination
+	directory as Sun's javac doesn't.
+	(cacao.stamp): Depend on OPENJDK_TREE.
+	(hotspot-tools-copy-source-files.stamp): Removed.
+	(hotspot-tools-source-files.txt): Removed.
+	(hotspot-tools-class-files.stamp): Removed.
+	(clean-hotspot-tools): Removed.
+	(hotspot-tools.stamp): Removed.
+	(rt-source-files.txt): Depend on OPENJDK_TREE.
+	(rt.stamp): Simplify use of jar.
+	(bootstrap/jdk1.7.0/jre/lib/tools.jar): Create symlink
+	rather than a separate jar file.
+	(clean-tools-jar): Remove hotspot-tools stuff.
+	(plugs.stamp): Depend on tools.jar
+	* tools-copy/tools-corba-copy-files.txt,
+	* tools-copy/tools-jaxws-copy-files.txt,
+	* tools-copy/tools-jdk-copy-files.txt,
+	* tools-copy/tools-langtools-copy-files.txt:
+	Removed.
+
 2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r d45442addd83 -r a47b53c08a6a Makefile.am
--- a/Makefile.am	Thu Feb 18 19:31:00 2010 +0000
+++ b/Makefile.am	Thu Feb 18 22:02:18 2010 +0000
@@ -82,10 +82,14 @@ ICEDTEA_BOOTSTRAP_DIRS = \
 	$(SHARE)/java/rmi \
 	$(SHARE)/sun/awt/ \
 	$(SHARE)/sun/nio/cs \
+	$(SHARE)/sun/rmi/rmic \
+	$(SHARE)/sun/tools/java \
 	$(SHARE)/javax/net/ssl \
 	$(SHARE)/javax/script \
 	$(SHARE)/javax/security/auth/kerberos \
-	$(SHARE)/javax/security/sasl
+	$(SHARE)/javax/security/sasl \
+	$(LANGTOOLS)/com/sun/mirror \
+	$(LANGTOOLS)/com/sun/tools/apt
 
 ICEDTEA_BOOTSTRAP_CLASSES = \
 	$(SHARE)/sun/misc/Unsafe.java
@@ -207,6 +211,10 @@ else
   ICEDTEA_HOME = $(abs_top_builddir)/bootstrap/icedtea
   INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
 endif
+
+# Target to ensure a patched OpenJDK tree containing Zero & Shark
+# and any overlays is available in $(abs_top_builddir)/openjdk
+OPENJDK_TREE = stamps/overlay.stamp
 
 # Sources list
 
@@ -577,7 +585,7 @@ endif
 
 EXTRA_DIST = rt generated \
 	$(abs_top_srcdir)/patches/* \
-	tools-copy contrib ports \
+	contrib ports \
 	extra overlays \
 	javaws.png javaws.desktop visualvm.desktop \
 	jconsole.desktop policytool.desktop \
@@ -605,14 +613,12 @@ distclean-local: clean-copy clean-jtreg 
 distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java 
 	rm -rf stamps
 	rm -f rt-source-files.txt \
-	  hotspot-tools-source-files.txt \
 	  extra-source-files.txt
 	rm -rf bootstrap
 	rm -rf lib
 	rm -rf extra-lib
 	rm -rf openjdk-ecj
 	rm -rf openjdk
-	rm -rf hotspot-tools
 	rm -rf rt/netscape
 	rm -rf visualvm
 	rm -rf netbeans
@@ -643,7 +649,7 @@ install:
 	clean-bootstrap-directory-symlink-ecj icedtea icedtea-debug \
 	clean-icedtea icedtea-against-icedtea clean-icedtea-ecj clean-plugs \
 	clean-tools-jar clean-visualvm clean-nbplatform \
-	clean-copy clean-hotspot-tools clean-rt $(ICEDTEAPLUGIN_CLEAN) \
+	clean-copy clean-rt $(ICEDTEAPLUGIN_CLEAN) \
 	$(ICEDTEANPPLUGIN_CLEAN) hotspot hotspot-helper clean-extra clean-jtreg \
 	clean-jtreg-reports 
 
@@ -1141,7 +1147,7 @@ endif
 
 # Copy over OpenJDK sources for ecj.
 # FIXME (missing): Rename to clone-ecj.
-stamps/extract-ecj.stamp: stamps/overlay.stamp
+stamps/extract-ecj.stamp: $(OPENJDK_TREE)
 	if ! test -d openjdk-ecj ; then \
 	    cp -pPRl openjdk openjdk-ecj ; \
 	fi
@@ -1246,14 +1252,12 @@ stamps/bootstrap-directory-ecj.stamp: st
 	  rm -f bootstrap/ecj/include/$$i; \
 	  ln -s $(SYSTEM_JDK_DIR)/include/$$i bootstrap/ecj/include/$$i; \
 	done; \
-	if test -f $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar ; \
-	then \
-	  mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
-	  ln -sf $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar \
-	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \
-	fi
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
 	  $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar;
+# For HotSpot
+	mkdir -p $(abs_top_builddir)/bootstrap/ecj/lib ; \
+	ln -sf $(abs_top_builddir)/bootstrap/ecj/jre/lib/rt.jar \
+	  $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar ; \
 	mkdir -p stamps
 	touch stamps/bootstrap-directory-ecj.stamp
 
@@ -1313,11 +1317,9 @@ clean-bootstrap-directory-symlink:
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
-	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+	stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \
+	$(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1416,11 +1418,9 @@ endif
 	touch stamps/icedtea.stamp
 
 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 \
-	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
-	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+	stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \
+	$(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1545,8 +1545,8 @@ icedtea-debug-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/patch-ecj.stamp stamps/cacao.stamp stamps/rewrite-rhino.stamp
+	stamps/plugs.stamp stamps/patch-ecj.stamp stamps/cacao.stamp \
+	stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
@@ -1568,8 +1568,7 @@ hotspot:
 	@echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
 
 hotspot-helper: stamps/bootstrap-directory-symlink-ecj.stamp \
-	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/patch-ecj.stamp
+	stamps/plugs.stamp stamps/patch-ecj.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ hotspot
@@ -1782,6 +1781,7 @@ endif
 
 stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
 if WITH_RHINO
+	mkdir -p $(abs_top_builddir)/rewriter
 	(cd $(abs_top_srcdir)/rewriter ; \
 	 $(ICEDTEA_BOOT_DIR)/bin/javac -g \
 	 -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
@@ -1865,7 +1865,7 @@ clean-visualvm:
 
 # CACAO
 
-stamps/cacao.stamp: stamps/replace-hotspot.stamp stamps/rt-class-files.stamp
+stamps/cacao.stamp: $(OPENJDK_TREE) stamps/rt-class-files.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 	cd cacao/cacao && \
@@ -2126,69 +2126,8 @@ jtregcheck: jtreg check-hotspot check-la
 
 # Support classes for non-OpenJDK bootstraps
 
-# FIXME (plugs): Remove this
-# tools.jar class files.
-stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
-	for copy_dir in \
-	  `cat $(abs_top_srcdir)/tools-copy/tools-jdk-copy-files.txt` ; \
-	do \
-	  mkdir -p hotspot-tools/$$copy_dir ; \
-	  cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/* \
-	    hotspot-tools/$$copy_dir ; \
-	done
-
-	for copy_dir in \
-	  `cat $(abs_top_srcdir)/tools-copy/tools-langtools-copy-files.txt` ; \
-	do \
-	  mkdir -p hotspot-tools/$$copy_dir ; \
-	  cp -pPRf openjdk/langtools/src/share/classes/$$copy_dir/* \
-	    hotspot-tools/$$copy_dir ; \
-	done
-
-	for copy_dir in \
-	  `cat $(abs_top_srcdir)/tools-copy/tools-corba-copy-files.txt` ; \
-	do \
-	  mkdir -p hotspot-tools/$$copy_dir ; \
-	  cp -pPRf openjdk/corba/src/share/classes/$$copy_dir/* \
-	    hotspot-tools/$$copy_dir ; \
-	done
-
-	mkdir -p stamps
-	touch stamps/hotspot-tools-copy-source-files.stamp
-
-# FIXME (plugs): Remove this
-hotspot-tools-source-files.txt: stamps/replace-hotspot.stamp \
-	stamps/hotspot-tools-copy-source-files.stamp
-	find hotspot-tools -name '*.java' | sort > $@
-	mkdir -p lib/hotspot-tools
-
-# FIXME (plugs): Remove this
-stamps/hotspot-tools-class-files.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
-  hotspot-tools-source-files.txt
-	$(ICEDTEA_BOOT_DIR)/bin/javac $(MEMORY_LIMIT) -g \
-	  -d lib/hotspot-tools \
-	  -source 1.5 \
-	  -sourcepath \
-	    'hotspot-tools:$(OPENJDK_SOURCEPATH_DIRS):$(ABS_SOURCE_DIRS)' \
-	  -classpath $(SYSTEM_JDK_DIR)/jre/lib/rt.jar \
-	  -bootclasspath \'\' @hotspot-tools-source-files.txt ;
-	mkdir -p stamps
-	touch stamps/hotspot-tools-class-files.stamp
-
-# FIXME (plugs): Remove this
-clean-hotspot-tools:
-	rm -rf lib/hotspot-tools
-	rm -f stamps/hotspot-tools-class-files.stamp
-	rm -f hotspot-tools-source-files.txt
-	rm -f stamps/hotspot-tools-copy-source-files.stamp
-
-# FIXME (plugs): Remove this
-stamps/hotspot-tools.stamp: bootstrap/jdk1.7.0/jre/lib/tools.jar
-	mkdir -p stamps
-	touch stamps/hotspot-tools.stamp
-
 # rt.jar additional class files.
-rt-source-files.txt: stamps/replace-hotspot.stamp 
+rt-source-files.txt: $(OPENJDK_TREE)
 	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
 	  | sort -u > $@
 	for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
@@ -2219,13 +2158,19 @@ clean-rt:
 	rm -f stamps/rt.stamp
 	rm -f rt-source-files.txt
 
+stamps/rt.stamp: stamps/rt-class-files.stamp \
+ stamps/bootstrap-directory-ecj.stamp
+	mkdir -p stamps
+if LACKS_SUN_AWT_TOOLKIT
+	$(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
+	  -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ;
+endif
+	touch stamps/rt.stamp
+
 # tools.jar
-bootstrap/jdk1.7.0/jre/lib/tools.jar: $(INITIAL_BOOTSTRAP_LINK_STAMP) \
-  stamps/hotspot-tools-class-files.stamp
+bootstrap/jdk1.7.0/jre/lib/tools.jar: 
 	mkdir -p bootstrap/jdk1.7.0/jre/lib/
-	$(ICEDTEA_BOOT_DIR)/bin/jar cf $@ -C lib/hotspot-tools com \
-	  -C lib/hotspot-tools sun \
-          -C lib/hotspot-tools org -C lib/hotspot-tools java ;
+	ln -sf $(ICEDTEA_RT) $(abs_top_builddir)/bootstrap/jdk1.7.0/jre/lib/tools.jar
 	if test -d bootstrap/ecj ; \
 	then \
 	  mkdir -p bootstrap/ecj/lib/; \
@@ -2233,28 +2178,14 @@ bootstrap/jdk1.7.0/jre/lib/tools.jar: $(
 	    $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
 	fi
 
-clean-tools-jar: clean-hotspot-tools
-	rm -f stamps/hotspot-tools.stamp
-	rm -rf tools/
+clean-tools-jar: 
 	rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
-
-stamps/rt.stamp: stamps/rt-class-files.stamp \
- stamps/bootstrap-directory-ecj.stamp
-	mkdir -p stamps
-if LACKS_SUN_AWT_TOOLKIT
-	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
-	then \
-	  $(JAR) uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
-	else \
-	  $(ICEDTEA_BOOT_DIR)/bin/jar uf $(ICEDTEA_RT) -C lib/rt com -C lib/rt java \
-	    -C lib/rt javax $(LIVECONNECT_DIR) -C lib/rt net -C lib/rt sun ; \
-	fi
-endif
-	touch stamps/rt.stamp
-
-stamps/plugs.stamp: stamps/rt.stamp
-	mkdir -p bootstrap/jdk1.7.0/jre/lib
+	if test -d bootstrap/ecj/lib ; then \
+	  rm -f $(abs_top_builddir)/bootstrap/ecj/lib/tools.jar; \
+	fi
+
+# rt-closed.jar
+stamps/plugs.stamp: stamps/rt.stamp bootstrap/jdk1.7.0/jre/lib/tools.jar
 	$(ICEDTEA_BOOT_DIR)/bin/jar cf $(ICEDTEA_PLUGS) \
 	  -C lib/rt com/sun/jmx/snmp $(LIVECONNECT_DIR) \
 	  -C lib/rt net -C lib/rt javax/jnlp ;
@@ -2327,12 +2258,6 @@ rt-class-files: stamps/rt-class-files.st
 
 replace-hotspot: stamps/replace-hotspot.stamp
 
-hotspot-tools-class-files: stamps/hotspot-tools-class-files.stamp
-
-hotspot-tools-copy-source-files: stamps/hotspot-tools-copy-source-files.stamp
-
-hotspot-tools: stamps/hotspot-tools.stamp
-
 hotspot-ports: stamps/ports.stamp
 
 clean: distclean-local
diff -r d45442addd83 -r a47b53c08a6a tools-copy/tools-corba-copy-files.txt
--- a/tools-copy/tools-corba-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-sun/rmi/rmic/iiop/
-com/sun/tools/corba/se/idl/som/
-com/sun/tools/corba/se/idl/som/idlemit/
-com/sun/tools/corba/se/idl/som/cff/
-com/sun/tools/corba/se/idl/toJavaPortable/
-com/sun/tools/corba/se/idl/constExpr/
diff -r d45442addd83 -r a47b53c08a6a tools-copy/tools-jaxws-copy-files.txt
--- a/tools-copy/tools-jaxws-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-com/sun/tools/internal/xjc/
-com/sun/tools/internal/xjc/generator/
-com/sun/tools/internal/xjc/generator/bean/
-com/sun/tools/internal/xjc/generator/bean/field/
-com/sun/tools/internal/xjc/generator/util/
-com/sun/tools/internal/xjc/generator/annotation/
-com/sun/tools/internal/xjc/generator/annotation/ri/
-com/sun/tools/internal/xjc/generator/annotation/spec/
-com/sun/tools/internal/xjc/addon/
-com/sun/tools/internal/xjc/addon/at_generated/
-com/sun/tools/internal/xjc/addon/code_injector/
-com/sun/tools/internal/xjc/addon/locator/
-com/sun/tools/internal/xjc/addon/sync/
-com/sun/tools/internal/xjc/reader/
-com/sun/tools/internal/xjc/reader/gbind/
-com/sun/tools/internal/xjc/reader/xmlschema/
-com/sun/tools/internal/xjc/reader/xmlschema/bindinfo/
-com/sun/tools/internal/xjc/reader/xmlschema/parser/
-com/sun/tools/internal/xjc/reader/xmlschema/ct/
-com/sun/tools/internal/xjc/reader/internalizer/
-com/sun/tools/internal/xjc/reader/relaxng/
-com/sun/tools/internal/xjc/reader/dtd/
-com/sun/tools/internal/xjc/reader/dtd/bindinfo/
-com/sun/tools/internal/xjc/runtime/
-com/sun/tools/internal/xjc/util/
-com/sun/tools/internal/xjc/outline/
-com/sun/tools/internal/xjc/api/
-com/sun/tools/internal/xjc/api/impl/
-com/sun/tools/internal/xjc/api/impl/s2j/
-com/sun/tools/internal/xjc/api/impl/j2s/
-com/sun/tools/internal/xjc/api/util/
-com/sun/tools/internal/xjc/model/
-com/sun/tools/internal/xjc/model/nav/
-com/sun/tools/internal/xjc/writer/
-com/sun/tools/internal/ws/
-com/sun/tools/internal/ws/spi/
-com/sun/tools/internal/ws/resources/
-com/sun/tools/internal/ws/wscompile/
-com/sun/tools/internal/ws/util/
-com/sun/tools/internal/ws/util/xml/
-com/sun/tools/internal/ws/wsdl/
-com/sun/tools/internal/ws/wsdl/document/
-com/sun/tools/internal/ws/wsdl/document/schema/
-com/sun/tools/internal/ws/wsdl/document/mime/
-com/sun/tools/internal/ws/wsdl/document/http/
-com/sun/tools/internal/ws/wsdl/document/soap/
-com/sun/tools/internal/ws/wsdl/document/jaxws/
-com/sun/tools/internal/ws/wsdl/parser/
-com/sun/tools/internal/ws/wsdl/framework/
-com/sun/tools/internal/ws/processor/
-com/sun/tools/internal/ws/processor/generator/
-com/sun/tools/internal/ws/processor/modeler/
-com/sun/tools/internal/ws/processor/modeler/wsdl/
-com/sun/tools/internal/ws/processor/modeler/annotation/
-com/sun/tools/internal/ws/processor/util/
-com/sun/tools/internal/ws/processor/model/
-com/sun/tools/internal/ws/processor/model/jaxb/
-com/sun/tools/internal/ws/processor/model/java/
-com/sun/tools/internal/ws/processor/model/exporter/
-com/sun/istack/internal/tools/
-com/sun/istack/internal/ws/
-com/sun/codemodel/
-com/sun/codemodel/internal/
-com/sun/codemodel/internal/fmt/
-com/sun/codemodel/internal/util/
-com/sun/codemodel/internal/writer/
-com/sun/tools/internal/jxc/
-com/sun/tools/internal/jxc/apt/
-com/sun/tools/internal/jxc/gen/
-com/sun/tools/internal/jxc/gen/config/
-com/sun/tools/internal/jxc/model/
-com/sun/tools/internal/jxc/model/nav/
-com/sun/xml/internal/rngom/
-com/sun/xml/internal/rngom/nc/
-com/sun/xml/internal/rngom/parse/
-com/sun/xml/internal/rngom/parse/compact/
-com/sun/xml/internal/rngom/parse/xml/
-com/sun/xml/internal/rngom/parse/host/
-com/sun/xml/internal/rngom/ast/
-com/sun/xml/internal/rngom/ast/om/
-com/sun/xml/internal/rngom/ast/util/
-com/sun/xml/internal/rngom/ast/builder/
-com/sun/xml/internal/rngom/xml/
-com/sun/xml/internal/rngom/xml/sax/
-com/sun/xml/internal/rngom/xml/util/
-com/sun/xml/internal/rngom/dt/
-com/sun/xml/internal/rngom/dt/builtin/
-com/sun/xml/internal/rngom/digested/
-com/sun/xml/internal/rngom/util/
-com/sun/xml/internal/rngom/binary/
-com/sun/xml/internal/rngom/binary/visitor/
-com/sun/xml/internal/xsom/
-com/sun/xml/internal/xsom/impl/
-com/sun/xml/internal/xsom/impl/parser/
-com/sun/xml/internal/xsom/impl/parser/state/
-com/sun/xml/internal/xsom/impl/util/
-com/sun/xml/internal/xsom/visitor/
-com/sun/xml/internal/xsom/parser/
-com/sun/xml/internal/xsom/util/
-com/sun/xml/internal/dtdparser/
-com/sun/xml/internal/dtdparser/resources/
diff -r d45442addd83 -r a47b53c08a6a tools-copy/tools-jdk-copy-files.txt
--- a/tools-copy/tools-jdk-copy-files.txt	Thu Feb 18 19:31:00 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-com/sun/jarsigner/
-com/sun/jdi/
-com/sun/jdi/connect/
-com/sun/jdi/request/
-com/sun/tools/attach/
-com/sun/tools/example/debug/expr/
-com/sun/tools/example/debug/tty/
-com/sun/tools/extcheck/
-com/sun/tools/script/shell/
-org/relaxng/datatype/
-org/relaxng/datatype/helpers/
-sun/applet/
-sun/applet/resources/
-sun/jvmstat/monitor/
-sun/jvmstat/monitor/remote/
-sun/jvmstat/perfdata/monitor/
-sun/jvmstat/perfdata/monitor/protocol/file/
-sun/jvmstat/perfdata/monitor/protocol/local/
-sun/jvmstat/perfdata/monitor/protocol/rmi/
-sun/jvmstat/perfdata/monitor/v1_0/
-sun/jvmstat/perfdata/monitor/v2_0/
-sun/rmi/rmic/
-sun/rmi/rmic/newrmic/
-sun/rmi/rmic/newrmic/jrmp/
-sun/tools/asm/
-sun/tools/attach/
-sun/tools/jar/


From andrew at icedtea.classpath.org  Thu Feb 18 17:16:58 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 19 Feb 2010 01:16:58 +0000
Subject: /hg/icedtea6: Explicitly compile java.nio.StringCharBuffer when ...
Message-ID: <hg.c597699b4fa6.1266542218.2873452341184383832@icedtea.classpath.org>

changeset c597699b4fa6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c597699b4fa6
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 01:16:48 2010 +0000

	Explicitly compile java.nio.StringCharBuffer when bootstrapping.

	2010-02-19 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add java/nio/StringCharBuffer.java to
	OPENJDK_BOOTSTRAP_CLASSES. Some versions of ecj seem not to
	build it automatically.


diffstat:

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

diffs (27 lines):

diff -r a47b53c08a6a -r c597699b4fa6 ChangeLog
--- a/ChangeLog	Thu Feb 18 22:02:18 2010 +0000
+++ b/ChangeLog	Fri Feb 19 01:16:48 2010 +0000
@@ -1,4 +1,11 @@ 2010-02-17 Andrew John Hughes  <ahughes@
-2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add java/nio/StringCharBuffer.java to
+	OPENJDK_BOOTSTRAP_CLASSES.  Some versions
+	of ecj seem not to build it automatically.
+
+2010-02-18 Andrew John Hughes  <ahughes at redhat.com>
 
 	Drop hotspot-tools targets to simplify
 	bootstrapping OpenJDK.
diff -r a47b53c08a6a -r c597699b4fa6 Makefile.am
--- a/Makefile.am	Thu Feb 18 22:02:18 2010 +0000
+++ b/Makefile.am	Fri Feb 19 01:16:48 2010 +0000
@@ -92,6 +92,7 @@ ICEDTEA_BOOTSTRAP_DIRS = \
 	$(LANGTOOLS)/com/sun/tools/apt
 
 ICEDTEA_BOOTSTRAP_CLASSES = \
+	$(SHARE)/java/nio/StringCharBuffer.java \
 	$(SHARE)/sun/misc/Unsafe.java
 
 # FIXME (javac): Settings for javac go here


From gbenson at icedtea.classpath.org  Fri Feb 19 01:58:11 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Fri, 19 Feb 2010 09:58:11 +0000
Subject: /hg/icedtea6: Backport "6927165: Zero S/390 fixes" from upstream
Message-ID: <hg.a508d7cd967a.1266573491.2873452341184383832@icedtea.classpath.org>

changeset a508d7cd967a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a508d7cd967a
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 19 09:58:06 2010 +0000

	Backport "6927165: Zero S/390 fixes" from upstream


diffstat:

3 files changed, 17 insertions(+), 4 deletions(-)
ChangeLog                                                |    7 +++++++
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp           |    4 ++--
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp |   10 ++++++++--

diffs (60 lines):

diff -r c597699b4fa6 -r a508d7cd967a ChangeLog
--- a/ChangeLog	Fri Feb 19 01:16:48 2010 +0000
+++ b/ChangeLog	Fri Feb 19 09:58:06 2010 +0000
@@ -1,3 +1,10 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+	Increase StackShadowPages from 3 to 5 on 32-bit platforms.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+	(os::atomic_copy64): Added s390 specific implementation.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r c597699b4fa6 -r a508d7cd967a ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 09:58:06 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ define_pd_global(intx,  PreInflateSpin, 
 
 define_pd_global(intx,  StackYellowPages,     2);
 define_pd_global(intx,  StackRedPages,        1);
-define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
+define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);
diff -r c597699b4fa6 -r a508d7cd967a 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	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Fri Feb 19 09:58:06 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,13 @@
                   "stfd %0, 0(%2)\n"
                   : "=f"(tmp)
                   : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+    double tmp;
+    asm volatile ("ld  %0, 0(%1)\n"
+                  "std %0, 0(%2)\n"
+                  : "=r"(tmp)
+                  : "a"(src), "a"(dst));
 #else
     *(jlong *) dst = *(jlong *) src;
-#endif // PPC && !_LP64
+#endif
   }


From ptisnovs at redhat.com  Fri Feb 19 02:34:27 2010
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Fri, 19 Feb 2010 11:34:27 +0100
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
Message-ID: <4B7E6933.7030700@redhat.com>

Andrew John Hughes wrote:
> I've just pushed the necessary Makefile changes to enable the Rhino
> rewriter and fix
> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
> This also coincided with the release of b18, which is now supported by
> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
> 
> Both have been well-tested (the latter over the last three months of
> work on b18), but please report any issues you may have building the
> newly updated IcedTea6.
> 
> Happy hacking,

Hi Andrew,

when I use build options --with-openjdk --without-rhino --disable-plugin
to build IcedTea6 from HEAD repository, build failed on RHEL 5 with this 
error message:

touch stamps/pulse-java.stamp
mkdir -p stamps
touch stamps/rewriter.stamp
make: *** No rule to make target `no', needed by 
`stamps/rewrite-rhino.stamp'.  Stop.


After removing --without-rhino option build seems ok.

Is it now necessary to always build IcedTea6 with Rhino? (and if yes 
should we remove this option from configure script?)

Pavel


From andrew at icedtea.classpath.org  Fri Feb 19 06:20:30 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 19 Feb 2010 14:20:30 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.84b9054850f7.1266589230.2873452341184383832@icedtea.classpath.org>

changeset 84b9054850f7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=84b9054850f7
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 14:19:25 2010 +0000

	Make sure the RHINO_JAR variable always refers to a valid file.

	2010-02-19 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (FIND_RHINO_JAR): Clear RHINO_JAR
	variable if it still contains "no" at the end of the
	macro.


changeset 6bac0de50532 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6bac0de50532
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 14:20:23 2010 +0000

	Merge


diffstat:

4 files changed, 28 insertions(+), 4 deletions(-)
ChangeLog                                                |   14 ++++++++++++++
acinclude.m4                                             |    4 ++++
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp           |    4 ++--
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp |   10 ++++++++--

diffs (81 lines):

diff -r c597699b4fa6 -r 6bac0de50532 ChangeLog
--- a/ChangeLog	Fri Feb 19 01:16:48 2010 +0000
+++ b/ChangeLog	Fri Feb 19 14:20:23 2010 +0000
@@ -1,3 +1,17 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(FIND_RHINO_JAR): Clear RHINO_JAR variable
+	if it still contains "no" at the end of the
+	macro.
+
+2010-02-19  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+	Increase StackShadowPages from 3 to 5 on 32-bit platforms.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+	(os::atomic_copy64): Added s390 specific implementation.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r c597699b4fa6 -r 6bac0de50532 acinclude.m4
--- a/acinclude.m4	Fri Feb 19 01:16:48 2010 +0000
+++ b/acinclude.m4	Fri Feb 19 14:20:23 2010 +0000
@@ -659,6 +659,10 @@ AC_DEFUN([FIND_RHINO_JAR],
   fi
   AC_MSG_RESULT(${RHINO_JAR})
   AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
+dnl Clear RHINO_JAR if it doesn't contain a valid filename
+  if test x"${RHINO_JAR}" = "xno"; then
+    RHINO_JAR=
+  fi
   AC_SUBST(RHINO_JAR)
 ])
 
diff -r c597699b4fa6 -r 6bac0de50532 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Fri Feb 19 14:20:23 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ define_pd_global(intx,  PreInflateSpin, 
 
 define_pd_global(intx,  StackYellowPages,     2);
 define_pd_global(intx,  StackRedPages,        1);
-define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
+define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);
diff -r c597699b4fa6 -r 6bac0de50532 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	Fri Feb 19 01:16:48 2010 +0000
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Fri Feb 19 14:20:23 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,13 @@
                   "stfd %0, 0(%2)\n"
                   : "=f"(tmp)
                   : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+    double tmp;
+    asm volatile ("ld  %0, 0(%1)\n"
+                  "std %0, 0(%2)\n"
+                  : "=r"(tmp)
+                  : "a"(src), "a"(dst));
 #else
     *(jlong *) dst = *(jlong *) src;
-#endif // PPC && !_LP64
+#endif
   }


From gnu_andrew at member.fsf.org  Fri Feb 19 06:21:18 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 19 Feb 2010 14:21:18 +0000
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <4B7E6933.7030700@redhat.com>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>
	<4B7E6933.7030700@redhat.com>
Message-ID: <17c6771e1002190621i6e8d2d08y458ee0aba032cafa@mail.gmail.com>

On 19 February 2010 10:34, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
> Andrew John Hughes wrote:
>>
>> I've just pushed the necessary Makefile changes to enable the Rhino
>> rewriter and fix
>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
>> This also coincided with the release of b18, which is now supported by
>> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
>>
>> Both have been well-tested (the latter over the last three months of
>> work on b18), but please report any issues you may have building the
>> newly updated IcedTea6.
>>
>> Happy hacking,
>
> Hi Andrew,
>
> when I use build options --with-openjdk --without-rhino --disable-plugin
> to build IcedTea6 from HEAD repository, build failed on RHEL 5 with this
> error message:
>
> touch stamps/pulse-java.stamp
> mkdir -p stamps
> touch stamps/rewriter.stamp
> make: *** No rule to make target `no', needed by
> `stamps/rewrite-rhino.stamp'. ?Stop.
>
>
> After removing --without-rhino option build seems ok.
>
> Is it now necessary to always build IcedTea6 with Rhino? (and if yes should
> we remove this option from configure script?)
>

No, issue fixed:

http://icedtea.classpath.org/hg/icedtea6/rev/84b9054850f7

> Pavel
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 xerxes at zafena.se  Fri Feb 19 06:25:49 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 19 Feb 2010 15:25:49 +0100
Subject: RFC: [patch] Update shark for LLVM r95390 API change.
Message-ID: <4B7E9F6D.3080102@zafena.se>

The attached patch makes shark build and run using llvm 2.7 svn r95390.
http://llvm.org/viewvc/llvm-project?view=rev&revision=95390

The LLVM change-set r95390 pawed the way to make LLVM a dynamic library
wich are quite cool and in order to do so it moved the implicitly used
--march, --mcpu, and --mattr functionality from JIT/TargetSelect.cpp to
lli.cpp to prevent a clutch with llc.
These changes made it necessary for Shark to explicitly define that it
makes use of --mcpu and --mattr, in a similar spirit like lli, for the
cpu autotuner.
Shark also needs to explicitly set these options during the creation of
the LLVM execution engine.
For some reason shark also needs to include the JIT.h header for the JIT
ctors to be linked in at all.

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
    (MCPU): Explicitly defined for use by LLVM command line parser.
    (MAttrs): Likewise.
    (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
    in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
    * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
    Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
    JIT are linked in.

OK to push?

Cheers
Xerxes
-------------- next part --------------
A non-text attachment was scrubbed...
Name: r95390.patch
Type: text/x-patch
Size: 2074 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100219/a946d4dc/r95390.patch 

From gbenson at redhat.com  Fri Feb 19 06:31:34 2010
From: gbenson at redhat.com (Gary Benson)
Date: Fri, 19 Feb 2010 14:31:34 +0000
Subject: RFC: [patch] Update shark for LLVM r95390 API change.
In-Reply-To: <4B7E9F6D.3080102@zafena.se>
References: <4B7E9F6D.3080102@zafena.se>
Message-ID: <20100219143134.GA3445@redhat.com>

Xerxes R?nby wrote:
> The attached patch makes shark build and run using llvm 2.7 svn r95390.
> http://llvm.org/viewvc/llvm-project?view=rev&revision=95390
> 
> The LLVM change-set r95390 pawed the way to make LLVM a dynamic library
> wich are quite cool and in order to do so it moved the implicitly used
> --march, --mcpu, and --mattr functionality from JIT/TargetSelect.cpp to
> lli.cpp to prevent a clutch with llc.
> These changes made it necessary for Shark to explicitly define that it
> makes use of --mcpu and --mattr, in a similar spirit like lli, for the
> cpu autotuner.
> Shark also needs to explicitly set these options during the creation of
> the LLVM execution engine.
> For some reason shark also needs to include the JIT.h header for the JIT
> ctors to be linked in at all.
> 
>     * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
>     (MCPU): Explicitly defined for use by LLVM command line parser.
>     (MAttrs): Likewise.
>     (SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
>     in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
>     * ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
>     Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
>     JIT are linked in.
> 
> OK to push?

Sure.

Cheers,
Gary

-- 
http://gbenson.net/


From ptisnovs at redhat.com  Fri Feb 19 06:55:50 2010
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Fri, 19 Feb 2010 15:55:50 +0100
Subject: IcedTea6 changes -- be prepared!
In-Reply-To: <17c6771e1002190621i6e8d2d08y458ee0aba032cafa@mail.gmail.com>
References: <17c6771e1002171530m19971ffpc341b4ae64be3f57@mail.gmail.com>	
	<4B7E6933.7030700@redhat.com>
	<17c6771e1002190621i6e8d2d08y458ee0aba032cafa@mail.gmail.com>
Message-ID: <4B7EA676.30105@redhat.com>

Andrew John Hughes wrote:
> On 19 February 2010 10:34, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
>> Andrew John Hughes wrote:
>>> I've just pushed the necessary Makefile changes to enable the Rhino
>>> rewriter and fix
>>> http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179
>>> This also coincided with the release of b18, which is now supported by
>>> IcedTea6 via the import of the changesets from the icedtea6-hg branch.
>>>
>>> Both have been well-tested (the latter over the last three months of
>>> work on b18), but please report any issues you may have building the
>>> newly updated IcedTea6.
>>>
>>> Happy hacking,
>> Hi Andrew,
>>
>> when I use build options --with-openjdk --without-rhino --disable-plugin
>> to build IcedTea6 from HEAD repository, build failed on RHEL 5 with this
>> error message:
>>
>> touch stamps/pulse-java.stamp
>> mkdir -p stamps
>> touch stamps/rewriter.stamp
>> make: *** No rule to make target `no', needed by
>> `stamps/rewrite-rhino.stamp'.  Stop.
>>
>>
>> After removing --without-rhino option build seems ok.
>>
>> Is it now necessary to always build IcedTea6 with Rhino? (and if yes should
>> we remove this option from configure script?)
>>
> 
> No, issue fixed:
> 
> http://icedtea.classpath.org/hg/icedtea6/rev/84b9054850f7
> 
Thank you

Pavel


From andrew at icedtea.classpath.org  Fri Feb 19 07:34:50 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 19 Feb 2010 15:34:50 +0000
Subject: /hg/icedtea6: Update CACAO patch for b18.
Message-ID: <hg.a6ee397f4b59.1266593690.2873452341184383832@icedtea.classpath.org>

changeset a6ee397f4b59 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a6ee397f4b59
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 15:34:31 2010 +0000

	Update CACAO patch for b18.

	2010-02-19 Andrew John Hughes <ahughes at redhat.com>

	 * patches/icedtea-cacao-ignore-jdi-tests.patch:
	Updated for b18.


diffstat:

2 files changed, 1453 insertions(+), 1311 deletions(-)
ChangeLog                                    |    5 
patches/icedtea-cacao-ignore-jdi-tests.patch | 2759 +++++++++++++-------------

diffs (truncated from 2820 to 500 lines):

diff -r 6bac0de50532 -r a6ee397f4b59 ChangeLog
--- a/ChangeLog	Fri Feb 19 14:20:23 2010 +0000
+++ b/ChangeLog	Fri Feb 19 15:34:31 2010 +0000
@@ -1,3 +1,8 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/icedtea-cacao-ignore-jdi-tests.patch:
+	Updated for b18.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r 6bac0de50532 -r a6ee397f4b59 patches/icedtea-cacao-ignore-jdi-tests.patch
--- a/patches/icedtea-cacao-ignore-jdi-tests.patch	Fri Feb 19 14:20:23 2010 +0000
+++ b/patches/icedtea-cacao-ignore-jdi-tests.patch	Fri Feb 19 15:34:31 2010 +0000
@@ -1,5 +1,1370 @@
---- openjdk/jdk/test/com/sun/jdi/TemplateTest.java.orig	2008-08-28 08:19:47.000000000 +0000
-+++ openjdk/jdk/test/com/sun/jdi/TemplateTest.java	2008-10-19 15:21:54.000000000 +0000
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AcceptTimeout.java openjdk/jdk/test/com/sun/jdi/AcceptTimeout.java
+--- openjdk.orig/jdk/test/com/sun/jdi/AcceptTimeout.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/AcceptTimeout.java	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 6198277
+  * @summary Test that each ListeningConnector that supports a "timeout" argument will
+  *     timeout with TransportTimeoutException
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AccessSpecifierTest.java openjdk/jdk/test/com/sun/jdi/AccessSpecifierTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/AccessSpecifierTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/AccessSpecifierTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4359628
+  *  @summary Test fix for JDI: methods Accessible.is...() lie about array types
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AfterThreadDeathTest.java openjdk/jdk/test/com/sun/jdi/AfterThreadDeathTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/AfterThreadDeathTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/AfterThreadDeathTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4364671
+  *  @summary Creating a StepRequest on a nonexistant thread fails
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/AllLineLocations.java openjdk/jdk/test/com/sun/jdi/AllLineLocations.java
+--- openjdk.orig/jdk/test/com/sun/jdi/AllLineLocations.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/AllLineLocations.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4248728
+  *  @summary Test ReferenceType.allLineLocations
+  *  @author Gordon Hirsch
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ArgumentValuesTest.java openjdk/jdk/test/com/sun/jdi/ArgumentValuesTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ArgumentValuesTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ArgumentValuesTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -1,5 +1,6 @@
+ /** hard coded linenumbers in other tests - DO NOT CHANGE
+  *  @test/nodynamiccopyright/
++ *  @ignore cacao nyi
+  *  @bug 4490824
+  *  @summary JDI: provide arguments when no debug attributes present
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh openjdk/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ArrayLengthDumpTest.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -25,6 +25,7 @@
+ 
+ #
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4422141 4695338
+ #  @summary TTY: .length field for arrays in print statements in jdb not recognized
+ #           TTY: dump <ArrayReference> command not implemented.
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ArrayRangeTest.java openjdk/jdk/test/com/sun/jdi/ArrayRangeTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ArrayRangeTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ArrayRangeTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4439631
+  *  @bug 4448721
+  *  @bug 4448603
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/BacktraceFieldTest.java openjdk/jdk/test/com/sun/jdi/BacktraceFieldTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/BacktraceFieldTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/BacktraceFieldTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4446677
+  *  @summary debuggee crashes when debugging under jbuilder
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/BadHandshakeTest.java openjdk/jdk/test/com/sun/jdi/BadHandshakeTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/BadHandshakeTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/BadHandshakeTest.java	2010-02-19 15:01:46.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 6306165 6432567
+  * @summary Check that a bad handshake doesn't cause a debuggee to abort
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/BreakpointTest.java openjdk/jdk/test/com/sun/jdi/BreakpointTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/BreakpointTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/BreakpointTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 6496524
+  *  @summary Setting breakpoint in jdb crashes Hotspot JVM
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CatchAllTest.sh openjdk/jdk/test/com/sun/jdi/CatchAllTest.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/CatchAllTest.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CatchAllTest.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -25,6 +25,7 @@
+ 
+ #
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4749692
+ #  @summary REGRESSION: jdb rejects the syntax catch java.lang.IndexOutOfBoundsException
+ #  @author Tim Bell
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CatchCaughtTest.sh openjdk/jdk/test/com/sun/jdi/CatchCaughtTest.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/CatchCaughtTest.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CatchCaughtTest.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -25,6 +25,7 @@
+ 
+ #
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4788864
+ #  @summary TTY: 'catch caught' with no class pattern throws NullPointerException
+ #  @author Tim Bell
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CatchPatternTest.sh openjdk/jdk/test/com/sun/jdi/CatchPatternTest.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/CatchPatternTest.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CatchPatternTest.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -24,6 +24,7 @@
+ #
+ 
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4671838
+ #  @summary TTY: surprising ExceptionSpec.resolveEventRequest() wildcard results
+ #  @author Tim Bell
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ClassesByName2Test.java openjdk/jdk/test/com/sun/jdi/ClassesByName2Test.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ClassesByName2Test.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ClassesByName2Test.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4406439 4925740
+  *  @summary ClassesByName2 verifies that all the classes in the loaded class list can be found with classesByName..
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ClassesByName.java openjdk/jdk/test/com/sun/jdi/ClassesByName.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ClassesByName.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ClassesByName.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4287992
+  *  @author Robert Field
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java openjdk/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ClassLoaderClassesTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4450091
+  *  @summary Test ClassLoaderReference.visibleClasses() which is
+  *  a direct pass-through of the JVMDI function GetClassLoaderClasses
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh openjdk/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CommandCommentDelimiter.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -25,6 +25,7 @@
+ 
+ #
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4507088
+ #  @summary TTY: Add a comment delimiter to the jdb command set
+ #  @author Tim Bell
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CompatibleConnectors.java openjdk/jdk/test/com/sun/jdi/CompatibleConnectors.java
+--- openjdk.orig/jdk/test/com/sun/jdi/CompatibleConnectors.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CompatibleConnectors.java	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 4287596
+  * @summary Unit test for "Pluggable Connectors and Transports" feature.
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java openjdk/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java
+--- openjdk.orig/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java	2010-02-17 03:14:51.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/connect/spi/DebugUsingCustomConnector.java	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 4287596
+  * @summary Unit test for "Pluggable Connectors and Transports" feature.
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java openjdk/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java
+--- openjdk.orig/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java	2010-02-17 03:14:51.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/connect/spi/GeneratedConnectors.java	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 4287596
+  * @summary Unit test for "Pluggable Connectors and Transports" feature.
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh openjdk/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	2010-02-17 03:14:51.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+ #
+ 
+ # @test
++# @ignore cacao nyi
+ # @bug 5055681
+ # @summary Test loading JDI classes via custom class loader
+ 
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ConnectedVMs.java openjdk/jdk/test/com/sun/jdi/ConnectedVMs.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ConnectedVMs.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ConnectedVMs.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4329140
+  *  @author Robert Field
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ConstantPoolInfo.java openjdk/jdk/test/com/sun/jdi/ConstantPoolInfo.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ConstantPoolInfo.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ConstantPoolInfo.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 5024104
+  *  @summary Test ReferenceType.majorVersion(), minorVersion, constantPoolCount and ConstantPool apis.
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CountEvent.java openjdk/jdk/test/com/sun/jdi/CountEvent.java
+--- openjdk.orig/jdk/test/com/sun/jdi/CountEvent.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CountEvent.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4315352
+  *  @summary disabling EventRequest expired with addCountFilter() throws
+  *   InternalException.
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/CountFilterTest.java openjdk/jdk/test/com/sun/jdi/CountFilterTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/CountFilterTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/CountFilterTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4321339
+  *  @summary Check correct processing of filters after a count filter
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/DebuggerThreadTest.java openjdk/jdk/test/com/sun/jdi/DebuggerThreadTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/DebuggerThreadTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/DebuggerThreadTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4513488
+  *  @summary Test for JDI: Internal JDI helper threads should setDaemon(true)
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java openjdk/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/DeleteAllBkptsTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4528948
+  *  @summary Unable to finish a debugging in NetBeans IDE
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java openjdk/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/DeleteEventRequestsTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4331872
+  *  @summary erm.deleteEventRequests(erm.breakpointRequests()) throws exception
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/DeoptimizeWalk.sh openjdk/jdk/test/com/sun/jdi/DeoptimizeWalk.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/DeoptimizeWalk.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/DeoptimizeWalk.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -24,6 +24,7 @@
+ #
+ 
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4525714
+ #  @summary jtreg test PopAsynchronousTest fails in build 85 with -Xcomp
+ #  @author Jim Holmlund/Swamy Venkataramanappa
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/DoubleAgentTest.java openjdk/jdk/test/com/sun/jdi/DoubleAgentTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/DoubleAgentTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/DoubleAgentTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 6354345
+  * @summary Check that a double agent request fails
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java openjdk/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 6431735
+  *  @summary Unexpected ClassCastException in ThreadReference.forceEarlyReturn
+  *  @author Jim Holmlund
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/EarlyReturnTest.java openjdk/jdk/test/com/sun/jdi/EarlyReturnTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/EarlyReturnTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/EarlyReturnTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /*
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 6175634
+  *  @summary Allow early return from methods
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/EnumTest.java openjdk/jdk/test/com/sun/jdi/EnumTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/EnumTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/EnumTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4728816
+  *  @summary JPDA: Add support for enums
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/EvalArgs.sh openjdk/jdk/test/com/sun/jdi/EvalArgs.sh
+--- openjdk.orig/jdk/test/com/sun/jdi/EvalArgs.sh	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/EvalArgs.sh	2010-02-19 14:59:03.000000000 +0000
+@@ -24,6 +24,7 @@
+ #
+ 
+ #  @test
++#  @ignore cacao nyi
+ #  @bug 4663146
+ #  @summary Arguments match no method error 
+ #  @author Jim Holmlund/Suvasis
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java openjdk/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/EventQueueDisconnectTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4425852
+  *  @author Robert Field
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ExceptionEvents.java openjdk/jdk/test/com/sun/jdi/ExceptionEvents.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ExceptionEvents.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ExceptionEvents.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4407397
+  *  @summary Test the requesting of exception events
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ExclusiveBind.java openjdk/jdk/test/com/sun/jdi/ExclusiveBind.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ExclusiveBind.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ExclusiveBind.java	2010-02-19 14:59:03.000000000 +0000
+@@ -22,6 +22,7 @@
+  */
+ 
+ /* @test
++ * @ignore cacao nyi
+  * @bug 4531526
+  * @summary Test that more than one debuggee cannot bind to same port
+  *          at the same time.
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java openjdk/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4453310
+  *  @summary Test the deletion of event requests that are expired
+  *     by virtue of addCountFilter.
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/FetchLocals.java openjdk/jdk/test/com/sun/jdi/FetchLocals.java
+--- openjdk.orig/jdk/test/com/sun/jdi/FetchLocals.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/FetchLocals.java	2010-02-19 14:59:03.000000000 +0000
+@@ -1,5 +1,6 @@
+ /** hard coded linenumbers in test - DO NOT CHANGE
+  *  @test/nodynamiccopyright/
++ *  @ignore cacao nyi
+  *  @bug 4386002 4429245
+  *  @summary Test fix for: Incorrect values reported for some locals of type long
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/FieldWatchpoints.java openjdk/jdk/test/com/sun/jdi/FieldWatchpoints.java
+--- openjdk.orig/jdk/test/com/sun/jdi/FieldWatchpoints.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/FieldWatchpoints.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4408582
+  *  @summary Test fix for: JDWP: WatchpointEvents outside of class filtered out
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/FilterMatch.java openjdk/jdk/test/com/sun/jdi/FilterMatch.java
+--- openjdk.orig/jdk/test/com/sun/jdi/FilterMatch.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/FilterMatch.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4331522
+  *  @summary addClassFilter("Foo") acts like "Foo*"
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/FilterNoMatch.java openjdk/jdk/test/com/sun/jdi/FilterNoMatch.java
+--- openjdk.orig/jdk/test/com/sun/jdi/FilterNoMatch.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/FilterNoMatch.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4331522
+  *  @summary addClassFilter("Foo") acts like "Foo*"
+  *
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/FinalizerTest.java openjdk/jdk/test/com/sun/jdi/FinalizerTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/FinalizerTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/FinalizerTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4272800 4274208 4392010
+  *  @summary Test debugger operations in finalize() methods
+  *  @author Gordon Hirsch  (modified for HotSpot by tbell & rfield)
+diff -Nru openjdk.orig/jdk/test/com/sun/jdi/FinalLocalsTest.java openjdk/jdk/test/com/sun/jdi/FinalLocalsTest.java
+--- openjdk.orig/jdk/test/com/sun/jdi/FinalLocalsTest.java	2010-02-17 03:14:50.000000000 +0000
++++ openjdk/jdk/test/com/sun/jdi/FinalLocalsTest.java	2010-02-19 14:59:03.000000000 +0000
+@@ -23,6 +23,7 @@
+ 
+ /**
+  *  @test
++ *  @ignore cacao nyi
+  *  @bug 4326648 4768329
+  *  @summary Test to verify that table entries are generated for all final
+  *           locals when a class is built for debug, even if they could be


From doko at icedtea.classpath.org  Fri Feb 19 11:39:55 2010
From: doko at icedtea.classpath.org (doko at icedtea.classpath.org)
Date: Fri, 19 Feb 2010 19:39:55 +0000
Subject: /hg/icedtea6: Additional vm builds: Only pass --with-hotspot-src...
Message-ID: <hg.546bafa175f1.1266608395.2873452341184383832@icedtea.classpath.org>

changeset 546bafa175f1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=546bafa175f1
author: doko at ubuntu.com
date: Fri Feb 19 20:25:47 2010 +0100

	Additional vm builds: Only pass --with-hotspot-src-zip if configured
	for alternate hotspot

	2010-02-19 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
	        --with-hotspot-src-zip if configured for alternate hotspot.


diffstat:

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

diffs (29 lines):

diff -r a6ee397f4b59 -r 546bafa175f1 ChangeLog
--- a/ChangeLog	Fri Feb 19 15:34:31 2010 +0000
+++ b/ChangeLog	Fri Feb 19 20:25:47 2010 +0100
@@ -1,3 +1,8 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
+	--with-hotspot-src-zip if configured for alternate hotspot.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-cacao-ignore-jdi-tests.patch:
diff -r a6ee397f4b59 -r 546bafa175f1 Makefile.am
--- a/Makefile.am	Fri Feb 19 15:34:31 2010 +0000
+++ b/Makefile.am	Fri Feb 19 20:25:47 2010 +0100
@@ -1943,9 +1943,12 @@ ADD_ZERO_CONFIGURE_ARGS += \
 			'--with-openjdk '--with-openjdk=% , \
 		$(CONFIGURE_ARGS)) \
 	$(if $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \
-	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \
+	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP))
+if WITH_ALT_HSBUILD
+ADD_ZERO_CONFIGURE_ARGS += \
 	$(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
 	  --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
+endif
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \


From doko at ubuntu.com  Fri Feb 19 15:28:11 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Sat, 20 Feb 2010 00:28:11 +0100
Subject: 6b18 build problems
Message-ID: <4B7F1E8B.6040904@ubuntu.com>

seen some build problems with 6b18

  - ant-1.8 returns an error code != 0 calling ant -diagnostics,
    breaking the build. if this is intended, then we need a
    workaround in openjdk.

  - cacao build failure when configured with
      --with-openjdk=/usr/lib/jvm/java-6-openjdk
      --with-hotspot-build=original
      --with-additional-vms=cacao
    works with a two stage build using gcj.

    details:
 
http://launchpadlibrarian.net/39430688/buildlog_ubuntu-lucid-armel.openjdk-6_6b18~pre1-0ubuntu1_FAILEDTOBUILD.txt.gz

  - make jtregcheck starts rebuilding the whole openjdk again. apparently
    an out of date stamp, or a missing stamp. still searching for this one.
    any ideas?

Matthias


From gnu_andrew at member.fsf.org  Sat Feb 20 03:19:39 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sat, 20 Feb 2010 11:19:39 +0000
Subject: 6b18 build problems
In-Reply-To: <4B7F1E8B.6040904@ubuntu.com>
References: <4B7F1E8B.6040904@ubuntu.com>
Message-ID: <17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>

On 19 February 2010 23:28, Matthias Klose <doko at ubuntu.com> wrote:
> seen some build problems with 6b18
>

>From the rest of your email it sounds like you actually mean IcedTea6
with the recent updates, rather than upstream OpenJDK6 in most cases.

> ?- ant-1.8 returns an error code != 0 calling ant -diagnostics,
> ? breaking the build.

Haven't seen this new version yet, but I would guess that is an
OpenJDK or Ant issue.

> if this is intended, then we need a
> ? workaround in openjdk.
>
> ?- cacao build failure when configured with
> ? ? --with-openjdk=/usr/lib/jvm/java-6-openjdk
> ? ? --with-hotspot-build=original
> ? ? --with-additional-vms=cacao
> ? works with a two stage build using gcj.
>

--with-cacao was broken until yesterday due to one of the patches.  I
haven't seen this failure and it's odd if it only occurs when using
--with-openjdk and not a full build.  Why would java.nio.ByteBuffer be
missing?  It's even in GCJ.

> ? details:
>
> http://launchpadlibrarian.net/39430688/buildlog_ubuntu-lucid-armel.openjdk-6_6b18~pre1-0ubuntu1_FAILEDTOBUILD.txt.gz
>
> ?- make jtregcheck starts rebuilding the whole openjdk again. apparently
> ? an out of date stamp, or a missing stamp. still searching for this one.
> ? any ideas?

No, other than make sure you're using the latest HEAD as I did fix a
few issues yesterday.

>
> Matthias
>

-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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  Sat Feb 20 06:35:31 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Sat, 20 Feb 2010 15:35:31 +0100
Subject: 6b18 build problems
In-Reply-To: <17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>
References: <4B7F1E8B.6040904@ubuntu.com>
	<17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>
Message-ID: <4B7FF333.3080402@ubuntu.com>

On 20.02.2010 12:19, Andrew John Hughes wrote:
> On 19 February 2010 23:28, Matthias Klose<doko at ubuntu.com>  wrote:
>> seen some build problems with 6b18
>>
>
>  From the rest of your email it sounds like you actually mean IcedTea6
> with the recent updates, rather than upstream OpenJDK6 in most cases.

yes (how much is "most" for three cases ?-)

>>   - ant-1.8 returns an error code != 0 calling ant -diagnostics,
>>    breaking the build.
>
> Haven't seen this new version yet, but I would guess that is an
> OpenJDK or Ant issue.
>
> if this is intended, then we need a
>    workaround in openjdk.

it looks like the build now requires the replaceregexp task, which at least in 
Debian is in the ant-optional package. However the exit code of ant -diagnostics 
doesn't change with this package installed.

>>   - cacao build failure when configured with
>>      --with-openjdk=/usr/lib/jvm/java-6-openjdk
>>      --with-hotspot-build=original
>>      --with-additional-vms=cacao
>>    works with a two stage build using gcj.
>>
>
> --with-cacao was broken until yesterday due to one of the patches.  I
> haven't seen this failure and it's odd if it only occurs when using
> --with-openjdk and not a full build.  Why would java.nio.ByteBuffer be
> missing?  It's even in GCJ.

the build did include these changes.

>>    details:
>>
>> http://launchpadlibrarian.net/39430688/buildlog_ubuntu-lucid-armel.openjdk-6_6b18~pre1-0ubuntu1_FAILEDTOBUILD.txt.gz
>>
>>   - make jtregcheck starts rebuilding the whole openjdk again. apparently
>>    an out of date stamp, or a missing stamp. still searching for this one.
>>    any ideas?
>
> No, other than make sure you're using the latest HEAD as I did fix a
> few issues yesterday.

no, didn't fix. Mark (W.), is this seen on the buildd's as well, when running 
make && make check?

   Matthias


From doko at icedtea.classpath.org  Sat Feb 20 12:50:08 2010
From: doko at icedtea.classpath.org (doko at icedtea.classpath.org)
Date: Sat, 20 Feb 2010 20:50:08 +0000
Subject: /hg/icedtea6: 2010-02-20  Matthias Klose  <doko@ubuntu.com>
Message-ID: <hg.40c6a61591e5.1266699007.2873452341184383832@icedtea.classpath.org>

changeset 40c6a61591e5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=40c6a61591e5
author: doko at ubuntu.com
date: Sat Feb 20 21:35:37 2010 +0100

	2010-02-20 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (stamps/icedtea.stamp, stamps/icedtea-
	debug.stamp): Depend on stamps/plugin.stamp instead of
	$(ICEDTEAPLUGIN_TARGET) and $(ICEDTEANPPLUGIN_TARGET).
	(icedtea): Depend on stamps/add-zero.stamp and stamps/add-
	cacao.stamp (icedtea-debug): Depend on stamps/add-cacao-
	debug.stamp and stamps/add-zero-debug.stamp.


diffstat:

2 files changed, 16 insertions(+), 7 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |   14 +++++++-------

diffs (64 lines):

diff -r 546bafa175f1 -r 40c6a61591e5 ChangeLog
--- a/ChangeLog	Fri Feb 19 20:25:47 2010 +0100
+++ b/ChangeLog	Sat Feb 20 21:35:37 2010 +0100
@@ -1,3 +1,12 @@ 2010-02-19  Matthias Klose  <doko at ubuntu
+2010-02-20  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
+	Depend on stamps/plugin.stamp instead of $(ICEDTEAPLUGIN_TARGET)
+	and $(ICEDTEANPPLUGIN_TARGET).
+	(icedtea): Depend on stamps/add-zero.stamp and stamps/add-cacao.stamp
+	(icedtea-debug): Depend on stamps/add-cacao-debug.stamp and
+	stamps/add-zero-debug.stamp.
+
 2010-02-19  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
diff -r 546bafa175f1 -r 40c6a61591e5 Makefile.am
--- a/Makefile.am	Fri Feb 19 20:25:47 2010 +0100
+++ b/Makefile.am	Sat Feb 20 21:35:37 2010 +0100
@@ -1318,8 +1318,8 @@ clean-bootstrap-directory-symlink:
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
-	stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \
-	$(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
+	extra-lib/about.jar stamps/cacao.stamp \
 	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -1419,8 +1419,8 @@ endif
 	touch stamps/icedtea.stamp
 
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
-	stamps/plugs.stamp $(OPENJDK_TREE) $(ICEDTEAPLUGIN_TARGET) \
-	$(ICEDTEANPPLUGIN_TARGET) extra-lib/about.jar stamps/cacao.stamp \
+	stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
+	extra-lib/about.jar stamps/cacao.stamp \
 	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
@@ -2041,7 +2041,7 @@ stamps/plugin-tests.stamp: $(INITIAL_BOO
 
 # jtreg
 
-stamps/jtreg.stamp: stamps/icedtea.stamp
+stamps/jtreg.stamp: stamps/icedtea.stamp stamps/add-zero.stamp stamps/add-cacao.stamp
 	rm -rf test/jtreg/classes
 	mkdir -p test/jtreg/classes
 	$(ICEDTEA_BOOT_DIR)/bin/javac -g -d test/jtreg/classes -source 1.5 \
@@ -2232,11 +2232,11 @@ extract: stamps/extract.stamp
 
 extract-ecj: stamps/extract-ecj.stamp
 
-icedtea: stamps/icedtea.stamp
+icedtea: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
 
 icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
 
-icedtea-debug: stamps/icedtea-debug.stamp
+icedtea-debug: stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 


From doko at ubuntu.com  Sat Feb 20 12:53:18 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Sat, 20 Feb 2010 21:53:18 +0100
Subject: 6b18 build problems
In-Reply-To: <4B7FF333.3080402@ubuntu.com>
References: <4B7F1E8B.6040904@ubuntu.com>	<17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>
	<4B7FF333.3080402@ubuntu.com>
Message-ID: <4B804BBE.4030706@ubuntu.com>

On 20.02.2010 15:35, Matthias Klose wrote:
> On 20.02.2010 12:19, Andrew John Hughes wrote:
>> On 19 February 2010 23:28, Matthias Klose<doko at ubuntu.com> wrote:

>>> http://launchpadlibrarian.net/39430688/buildlog_ubuntu-lucid-armel.openjdk-6_6b18~pre1-0ubuntu1_FAILEDTOBUILD.txt.gz
>>>
>>>
>>> - make jtregcheck starts rebuilding the whole openjdk again. apparently
>>> an out of date stamp, or a missing stamp. still searching for this one.
>>> any ideas?
>>
>> No, other than make sure you're using the latest HEAD as I did fix a
>> few issues yesterday.
>
> no, didn't fix. Mark (W.), is this seen on the buildd's as well, when
> running make && make check?

this seems to be broken by the recent IcedTea6 changes when updated to b18:

   Prerequisite `bootstrap/jdk1.7.0/jre/lib/tools.jar'
      is newer than target `stamps/plugs.stamp'.
   Must remake target `stamps/plugs.stamp'.

The `bootstrap/jdk1.7.0/jre/lib/tools.jar' seems to be a micro optimization 
(only build it once for the openjdk-ecj and openjdk builds?).

The tools.jar symlink seems to be modified in the 
stamps/bootstrap-directory-ecj.stamp target as well.

I'm adding the add-*.stamp targets to the jtreg target so that these targets are 
rebuilt as well, but that doesn't fix the original bug.

   Matthias


From doko at ubuntu.com  Sat Feb 20 13:11:57 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Sat, 20 Feb 2010 22:11:57 +0100
Subject: 6b18 build problems
In-Reply-To: <4B7FF333.3080402@ubuntu.com>
References: <4B7F1E8B.6040904@ubuntu.com>	<17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>
	<4B7FF333.3080402@ubuntu.com>
Message-ID: <4B80501D.6080108@ubuntu.com>

On 20.02.2010 15:35, Matthias Klose wrote:
> On 20.02.2010 12:19, Andrew John Hughes wrote:
>>> - cacao build failure when configured with
>>> --with-openjdk=/usr/lib/jvm/java-6-openjdk
>>> --with-hotspot-build=original
>>> --with-additional-vms=cacao
>>> works with a two stage build using gcj.
>>>
>>
>> --with-cacao was broken until yesterday due to one of the patches. I
>> haven't seen this failure and it's odd if it only occurs when using
>> --with-openjdk and not a full build. Why would java.nio.ByteBuffer be
>> missing? It's even in GCJ.
>
> the build did include these changes.

Making install in native
make[4]: Entering directory 
`/scratch/packages/openjdk/b18/openjdk-6-6b18~pre1/build/cacao/cacao-0.99.4/src/native'
Making install in include
make[5]: Entering directory 
`/scratch/packages/openjdk/b18/openjdk-6-6b18~pre1/build/cacao/cacao-0.99.4/src/native/include'
../../../src/cacaoh/cacaoh -bootclasspath 
/scratch/packages/openjdk/b18/openjdk-6-6b18~pre1/build/lib/rt -d . java.lang.Class
java.lang.ClassNotFoundException: java/lang/Object
/bin/bash: line 2: 28931 Aborted                 ../../../src/cacaoh/cacaoh 
-bootclasspath /scratch/packages/openjdk/b18/openjdk-6-6b18~pre1/build/lib/rt -d 
. $class
make[5]: *** [java_lang_Class.h] Error 134
make[5]: Leaving directory 
`/scratch/packages/openjdk/b18/openjdk-6-6b18~pre1/build/cacao/cacao-0.99.4/src/native/include'
make[4]: *** [install-recursive] Error 1

build/lib/rt doesn't contain java/lang/*, while it did before the update. Which 
were there reasons to drop this?

   Matthias


From gnu_andrew at member.fsf.org  Sat Feb 20 16:49:29 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 21 Feb 2010 00:49:29 +0000
Subject: 6b18 build problems
In-Reply-To: <4B7FF333.3080402@ubuntu.com>
References: <4B7F1E8B.6040904@ubuntu.com>
	<17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>
	<4B7FF333.3080402@ubuntu.com>
Message-ID: <17c6771e1002201649k218c4b30wdded3235ac2dce5d@mail.gmail.com>

On 20 February 2010 14:35, Matthias Klose <doko at ubuntu.com> wrote:
> On 20.02.2010 12:19, Andrew John Hughes wrote:
>>
>> On 19 February 2010 23:28, Matthias Klose<doko at ubuntu.com> ?wrote:
>>>
>>> seen some build problems with 6b18
>>>
>>
>> ?From the rest of your email it sounds like you actually mean IcedTea6
>> with the recent updates, rather than upstream OpenJDK6 in most cases.
>
> yes (how much is "most" for three cases ?-)
>

All but the first seem to be related to IcedTea6, but my point was
more that I wanted to know whether you were doing an IcedTea build
(./configure && make) or an  OpenJDK build (make <numerous_options>)..
 I regularly do both, so it's not immediately obvious to me which one
is being discussed if you just mention an OpenJDK tarball.

>>> ?- ant-1.8 returns an error code != 0 calling ant -diagnostics,
>>> ? breaking the build.
>>
>> Haven't seen this new version yet, but I would guess that is an
>> OpenJDK or Ant issue.
>>
>> if this is intended, then we need a
>> ? workaround in openjdk.
>
> it looks like the build now requires the replaceregexp task, which at least
> in Debian is in the ant-optional package. However the exit code of ant
> -diagnostics doesn't change with this package installed.
>

Yes, the replaceregexp task has been needed for a while for 7.  It's
to do with the change to drop-in tarballs for JAXP and JAXWS.

I've not got a system with such a new Ant yet (is this some unstable
Ubuntu you're testing on?) so not currently in a situation to see this
bug.

>>> ?- cacao build failure when configured with
>>> ? ? --with-openjdk=/usr/lib/jvm/java-6-openjdk
>>> ? ? --with-hotspot-build=original
>>> ? ? --with-additional-vms=cacao
>>> ? works with a two stage build using gcj.
>>>
>>
>> --with-cacao was broken until yesterday due to one of the patches. ?I
>> haven't seen this failure and it's odd if it only occurs when using
>> --with-openjdk and not a full build. ?Why would java.nio.ByteBuffer be
>> missing? ?It's even in GCJ.
>
> the build did include these changes.
>

What changes?  It does make some bootstrapping changes because these
are necessary with the JAXP and JAXWS sources vanishing.  I don't see
how this would affect ByteBuffer and certainly not on an OpenJDK build
which doesn't need the bootstrapping anyway.

I'll have a look when I'm back at work on Monday.

>>> ? details:
>>>
>>>
>>> http://launchpadlibrarian.net/39430688/buildlog_ubuntu-lucid-armel.openjdk-6_6b18~pre1-0ubuntu1_FAILEDTOBUILD.txt.gz
>>>
>>> ?- make jtregcheck starts rebuilding the whole openjdk again. apparently
>>> ? an out of date stamp, or a missing stamp. still searching for this one.
>>> ? any ideas?
>>
>> No, other than make sure you're using the latest HEAD as I did fix a
>> few issues yesterday.
>
> no, didn't fix. Mark (W.), is this seen on the buildd's as well, when
> running make && make check?
>

If you're referring to Mark's builds on the icedtea.classpath.org
servers, they don't seem to be getting as far as make check for some
reason I can't yet fathom.

We have automated tests going on a box inside Red Hat   I haven't yet
checked that in detail yet to see if it is repeating part of the
build.  Probably some dead Makefile target.  I think it's probably
worth documenting the current targets somewhere and nuking any that
are unused/unneeded and more importantly not well-maintained.

This is just thoughts off the top of my head; I'll look into the
issues on Monday.

> ?Matthias
>

Cheers,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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  Sat Feb 20 17:53:09 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Sun, 21 Feb 2010 02:53:09 +0100
Subject: 6b18 build problems
In-Reply-To: <17c6771e1002201649k218c4b30wdded3235ac2dce5d@mail.gmail.com>
References: <4B7F1E8B.6040904@ubuntu.com>	
	<17c6771e1002200319x751ad52bi69f60762795a6cb2@mail.gmail.com>	
	<4B7FF333.3080402@ubuntu.com>
	<17c6771e1002201649k218c4b30wdded3235ac2dce5d@mail.gmail.com>
Message-ID: <4B809205.4020106@ubuntu.com>

On 21.02.2010 01:49, Andrew John Hughes wrote:
>> it looks like the build now requires the replaceregexp task, which at least
>> in Debian is in the ant-optional package. However the exit code of ant
       ^^^^^^

>> -diagnostics doesn't change with this package installed.
>>
>
> Yes, the replaceregexp task has been needed for a while for 7.  It's
> to do with the change to drop-in tarballs for JAXP and JAXWS.
>
> I've not got a system with such a new Ant yet (is this some unstable
> Ubuntu you're testing on?) so not currently in a situation to see this
> bug.

see above.

>
>>>>   - cacao build failure when configured with
>>>>      --with-openjdk=/usr/lib/jvm/java-6-openjdk
>>>>      --with-hotspot-build=original
>>>>      --with-additional-vms=cacao
>>>>    works with a two stage build using gcj.
>>>>
>>>
>>> --with-cacao was broken until yesterday due to one of the patches.  I
>>> haven't seen this failure and it's odd if it only occurs when using
>>> --with-openjdk and not a full build.  Why would java.nio.ByteBuffer be
>>> missing?  It's even in GCJ.
>>
>> the build did include these changes.
>>
>
> What changes?

tip of IcedTea6

> It does make some bootstrapping changes because these
> are necessary with the JAXP and JAXWS sources vanishing.  I don't see
> how this would affect ByteBuffer and certainly not on an OpenJDK build
> which doesn't need the bootstrapping anyway.
>
> I'll have a look when I'm back at work on Monday.
>
>>>>    details:
>>>>
>>>>
>>>> http://launchpadlibrarian.net/39430688/buildlog_ubuntu-lucid-armel.openjdk-6_6b18~pre1-0ubuntu1_FAILEDTOBUILD.txt.gz
>>>>
>>>>   - make jtregcheck starts rebuilding the whole openjdk again. apparently
>>>>    an out of date stamp, or a missing stamp. still searching for this one.
>>>>    any ideas?
>>>
>>> No, other than make sure you're using the latest HEAD as I did fix a
>>> few issues yesterday.
>>
>> no, didn't fix. Mark (W.), is this seen on the buildd's as well, when
>> running make&&  make check?
>>
>
> If you're referring to Mark's builds on the icedtea.classpath.org
> servers, they don't seem to be getting as far as make check for some
> reason I can't yet fathom.

yes, I can't this failure as well.

> We have automated tests going on a box inside Red Hat   I haven't yet
> checked that in detail yet to see if it is repeating part of the
> build.  Probably some dead Makefile target.  I think it's probably
> worth documenting the current targets somewhere and nuking any that
> are unused/unneeded and more importantly not well-maintained.
>
> This is just thoughts off the top of my head; I'll look into the
> issues on Monday.

cool, thanks!

   Matthias


From andrew at icedtea.classpath.org  Sun Feb 21 04:39:06 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Sun, 21 Feb 2010 12:39:06 +0000
Subject: /hg/icedtea6: Add missing -debug suffix in icedtea-debug.stamp t...
Message-ID: <hg.ede5e9311ef4.1266755946.2873452341184383832@icedtea.classpath.org>

changeset ede5e9311ef4 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=ede5e9311ef4
author: Andrew John Hughes <ahughes at redhat.com>
date: Sun Feb 21 12:38:45 2010 +0000

	Add missing -debug suffix in icedtea-debug.stamp target.

	2010-02-21 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (icedtea-debug.stamp): Add missing
	-debug on end of $(BUILD_OUTPUT_DIR).


diffstat:

2 files changed, 15 insertions(+), 9 deletions(-)
ChangeLog   |    8 +++++++-
Makefile.am |   16 ++++++++--------

diffs (65 lines):

diff -r 40c6a61591e5 -r ede5e9311ef4 ChangeLog
--- a/ChangeLog	Sat Feb 20 21:35:37 2010 +0100
+++ b/ChangeLog	Sun Feb 21 12:38:45 2010 +0000
@@ -1,3 +1,9 @@ 2010-02-20  Matthias Klose  <doko at ubuntu
+2010-02-21 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(icedtea-debug.stamp): Add missing -debug on
+	end of $(BUILD_OUTPUT_DIR).
+
 2010-02-20  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
@@ -803,7 +809,7 @@ 2010-01-04  Andrew John Hughes  <ahughes
 	* Makefile.am:
 	Drop redundant (and broken in some cases)
 	symbolic link.
-	
+
 2009-12-27  Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/ecj/icedtea-jaxp-dependency.patch:
diff -r 40c6a61591e5 -r ede5e9311ef4 Makefile.am
--- a/Makefile.am	Sat Feb 20 21:35:37 2010 +0100
+++ b/Makefile.am	Sun Feb 21 12:38:45 2010 +0000
@@ -1489,31 +1489,31 @@ if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
 if ENABLE_SYSTEMTAP
-	mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \
+	mkdir -p $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset ; \
 	grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \
 	if test $$? -eq 0; then \
 	  sed -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
 	  sed -e '/\/client\/libjvm.so/d' \
 	    < $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    > $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
 	else \
 	  cp $(abs_top_builddir)/tapset/hotspot.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \
+	    $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot.stp; \
 	  cp $(abs_top_builddir)/tapset/hotspot_jni.stp \
-	    $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \
+	    $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/hotspot_jni.stp; \
 	fi; \
 	cp $(abs_top_builddir)/tapset/jstack.stp \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/jstack.stp
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/tapset/jstack.stp
 endif
 if ENABLE_NSS
 	cp $(abs_top_builddir)/nss.cfg \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/security;
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/security;
 endif
 if WITH_TZDATA_DIR
 	cp $(abs_top_builddir)/tz.properties \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib;
 endif
 	@echo "IcedTea (debug build) is served:" \
 	  $(BUILD_OUTPUT_DIR)-debug


From xranby at icedtea.classpath.org  Sun Feb 21 07:26:57 2010
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Sun, 21 Feb 2010 15:26:57 +0000
Subject: /hg/icedtea6: Update Shark for LLVM r95390 API change.
Message-ID: <hg.6571641c60ab.1266766017.2873452341184383832@icedtea.classpath.org>

changeset 6571641c60ab in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6571641c60ab
author: Xerxes R?nby <xerxes at zafena.se>
date: Sun Feb 21 16:24:11 2010 +0100

	Update Shark for LLVM r95390 API change.

	2010-02-21 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(MCPU): Explicitly defined for use by LLVM command line parser.
	(MAttrs): Likewise. (SharkCompiler::SharkCompiler): Create
	the JIT using LLVM EngineBuilder in order to explicitly set
	MCPU and MAttrs when using LLVM 2.7.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Include
	llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the JIT
	are linked in.


diffstat:

3 files changed, 41 insertions(+), 3 deletions(-)
ChangeLog                                          |   11 ++++++
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp   |    1 
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |   32 ++++++++++++++++++--

diffs (78 lines):

diff -r ede5e9311ef4 -r 6571641c60ab ChangeLog
--- a/ChangeLog	Sun Feb 21 12:38:45 2010 +0000
+++ b/ChangeLog	Sun Feb 21 16:24:11 2010 +0100
@@ -1,3 +1,14 @@ 2010-02-21 Andrew John Hughes  <ahughes@
+2010-02-21  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(MCPU): Explicitly defined for use by LLVM command line parser.
+	(MAttrs): Likewise.
+	(SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
+	in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
+	JIT are linked in.
+
 2010-02-21 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r ede5e9311ef4 -r 6571641c60ab ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Sun Feb 21 16:24:11 2010 +0100
@@ -44,6 +44,7 @@
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
 #include <llvm/Support/CommandLine.h>
 #if SHARK_LLVM_VERSION >= 27
+#include <llvm/ExecutionEngine/JIT.h>
 #include <llvm/ADT/StringMap.h>
 #include <llvm/Support/Debug.h>
 #include <llvm/System/Host.h>
diff -r ede5e9311ef4 -r 6571641c60ab ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Sun Feb 21 16:24:11 2010 +0100
@@ -29,6 +29,17 @@
 #include <fnmatch.h>
 
 using namespace llvm;
+
+#if SHARK_LLVM_VERSION >= 27
+namespace {
+  cl::opt<std::string>
+  MCPU("mcpu");
+
+  cl::list<std::string>
+  MAttrs("mattr",
+         cl::CommaSeparated);
+}
+#endif
 
 SharkCompiler::SharkCompiler()
   : AbstractCompiler()
@@ -77,9 +88,24 @@ SharkCompiler::SharkCompiler()
   cl::ParseCommandLineOptions(args.size() - 1, (char **) &args[0]);
 
   // Create the JIT
-  _execution_engine = ExecutionEngine::createJIT(
-    _normal_context->module(),
-    NULL, memory_manager(), CodeGenOpt::Default);
+  std::string ErrorMsg;
+
+  EngineBuilder builder(_normal_context->module());
+  builder.setMCPU(MCPU);
+  builder.setMAttrs(MAttrs);
+  builder.setJITMemoryManager(memory_manager());
+  builder.setEngineKind(EngineKind::JIT);
+  builder.setErrorStr(&ErrorMsg);
+  _execution_engine = builder.create();
+
+  if (!execution_engine()) {
+    if (!ErrorMsg.empty())
+      printf("Error while creating Shark JIT: %s\n",ErrorMsg.c_str());
+    else
+      printf("Unknown error while creating Shark JIT\n");
+    exit(1);
+  }
+
   execution_engine()->addModule(
     _native_context->module());
 #else


From gnu_andrew at member.fsf.org  Sun Feb 21 11:23:18 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 21 Feb 2010 19:23:18 +0000
Subject: icedtea-test mailing list
Message-ID: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>

Who has control of the icedtea-test list?  Messages from our
autobuilder are not coming through so presumably someone needs to
approve them, but I don't know who.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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  Sun Feb 21 13:06:07 2010
From: mark at klomp.org (Mark Wielaard)
Date: Sun, 21 Feb 2010 22:06:07 +0100
Subject: icedtea-test mailing list
In-Reply-To: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
Message-ID: <1266786367.2479.13.camel@hermans.wildebeest.org>

On Sun, 2010-02-21 at 19:23 +0000, Andrew John Hughes wrote:
> Who has control of the icedtea-test list?  Messages from our
> autobuilder are not coming through so presumably someone needs to
> approve them, but I don't know who.

Lillian and I are. I added you to the list moderators and will send you
the admin password through private email.

Cheers,

Mark



From gnu_andrew at member.fsf.org  Sun Feb 21 13:17:26 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 21 Feb 2010 21:17:26 +0000
Subject: icedtea-test mailing list
In-Reply-To: <1266786367.2479.13.camel@hermans.wildebeest.org>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
Message-ID: <17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>

On 21 February 2010 21:06, Mark Wielaard <mark at klomp.org> wrote:
> On Sun, 2010-02-21 at 19:23 +0000, Andrew John Hughes wrote:
>> Who has control of the icedtea-test list? ?Messages from our
>> autobuilder are not coming through so presumably someone needs to
>> approve them, but I don't know who.
>
> Lillian and I are. I added you to the list moderators and will send you
> the admin password through private email.
>

Hmmm, thanks Mark but that seems to be testresults at icedtea.classpath.org.

The one I was referring to is icedtea-test at openjdk.java.net:

http://mail.openjdk.java.net/mailman/listinfo/icedtea-test

One wonders why we have two lists doing the same job...

As the IcedTea one seems to actually be active, maybe I should use that.

> Cheers,
>
> Mark
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 Feb 22 02:58:07 2010
From: mark at klomp.org (Mark Wielaard)
Date: Mon, 22 Feb 2010 11:58:07 +0100
Subject: icedtea-test mailing list
In-Reply-To: <17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
	<17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
Message-ID: <1266836287.4864.10.camel@springer.wildebeest.org>

On Sun, 2010-02-21 at 21:17 +0000, Andrew John Hughes wrote:
> > Lillian and I are. I added you to the list moderators and will send you
> > the admin password through private email.
> >
> Hmmm, thanks Mark but that seems to be testresults at icedtea.classpath.org.
> 
> The one I was referring to is icedtea-test at openjdk.java.net:
> 
> http://mail.openjdk.java.net/mailman/listinfo/icedtea-test
> 
> One wonders why we have two lists doing the same job...

I don't know why the second one was created, it seems to never have had
any messages. Maybe it is for the openjdk forest?

> As the IcedTea one seems to actually be active, maybe I should use that.

Yes, it would be nice to have all reports end up in the same place.

Thanks,

Mark



From Dalibor.Topic at Sun.COM  Mon Feb 22 03:08:26 2010
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Mon, 22 Feb 2010 12:08:26 +0100
Subject: icedtea-test mailing list
In-Reply-To: <17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
	<17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
Message-ID: <4B8265AA.9000306@sun.com>

Andrew John Hughes wrote:
> On 21 February 2010 21:06, Mark Wielaard <mark at klomp.org> wrote:
>> On Sun, 2010-02-21 at 19:23 +0000, Andrew John Hughes wrote:
>>> Who has control of the icedtea-test list?  Messages from our
>>> autobuilder are not coming through so presumably someone needs to
>>> approve them, but I don't know who.

Thanks for bringing this to my attention. Over the weekend a few 
mails from an unsubscribed sender, Man Wong at Red Hat, ended up in the 
moderation queue for the icedtea-test mailing list. The moderation
mails basically looked like this:

    List:    icedtea-test at openjdk.java.net
    From:    mwong ...
    Subject: Hudson build is back to normal : IcedTea6TargetTesting #242
    Reason:  Post by non-member to a members-only list


The OpenJDK mailing lists in general do not permit unsubscribed posting.

As soon as Man subscribes to the list, the posts should fly through as
expected. The subscription interface for that mailing list is located at 

http://mail.openjdk.java.net/mailman/listinfo/icedtea-test

> The one I was referring to is icedtea-test at openjdk.java.net:
> 
> http://mail.openjdk.java.net/mailman/listinfo/icedtea-test

If you scroll down that page, you'll find my e-mail address as the 
list owner.
 
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
Vorsitzender des Aufsichtsrates: Martin H?ring




From Dalibor.Topic at Sun.COM  Mon Feb 22 03:38:58 2010
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Mon, 22 Feb 2010 12:38:58 +0100
Subject: icedtea-test mailing list
In-Reply-To: <4B8265AA.9000306@sun.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
	<17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
	<4B8265AA.9000306@sun.com>
Message-ID: <4B826CD2.30809@sun.com>

Dalibor Topic wrote:
> As soon as Man subscribes to the list, the posts should fly through as
> expected.
Scratch that. I added Man to the list of accepted senders, so it
should just work now, fingers crossed, etc.

The mails from the weekend have made their way into the archives
now: 

http://mail.openjdk.java.net/pipermail/icedtea-test/2010-February/thread.html

Unfortunately, there is nothing to see at toadeater:8080 - it seems
that a part of the Hudson instance URL is missing.

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
Vorsitzender des Aufsichtsrates: Martin H?ring




From gnu_andrew at member.fsf.org  Mon Feb 22 03:49:45 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 22 Feb 2010 11:49:45 +0000
Subject: icedtea-test mailing list
In-Reply-To: <4B826CD2.30809@sun.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
	<17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
	<4B8265AA.9000306@sun.com> <4B826CD2.30809@sun.com>
Message-ID: <17c6771e1002220349j32a288dj71765441e5cb330f@mail.gmail.com>

On 22 February 2010 11:38, Dalibor Topic <Dalibor.Topic at sun.com> wrote:
> Dalibor Topic wrote:
>> As soon as Man subscribes to the list, the posts should fly through as
>> expected.
> Scratch that. I added Man to the list of accepted senders, so it
> should just work now, fingers crossed, etc.
>

Thanks.  Still don't know why they appear to be coming from Man.  He
probably should subscribe to the list though :-)

> The mails from the weekend have made their way into the archives
> now:
>
> http://mail.openjdk.java.net/pipermail/icedtea-test/2010-February/thread.html
>
> Unfortunately, there is nothing to see at toadeater:8080 - it seems
> that a part of the Hudson instance URL is missing.
>

It wouldn't help if it was complete as it's an internal machine.  Long
term, it would be nice to move it to an external box but I don't know
of any such resources.

> 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
> Vorsitzender des Aufsichtsrates: Martin H?ring
>
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 Dalibor.Topic at Sun.COM  Mon Feb 22 04:03:25 2010
From: Dalibor.Topic at Sun.COM (Dalibor Topic)
Date: Mon, 22 Feb 2010 13:03:25 +0100
Subject: icedtea-test mailing list
In-Reply-To: <17c6771e1002220349j32a288dj71765441e5cb330f@mail.gmail.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
	<17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
	<4B8265AA.9000306@sun.com> <4B826CD2.30809@sun.com>
	<17c6771e1002220349j32a288dj71765441e5cb330f@mail.gmail.com>
Message-ID: <4B82728D.6020702@sun.com>

Andrew John Hughes wrote:
> On 22 February 2010 11:38, Dalibor Topic <Dalibor.Topic at sun.com> wrote:

> Thanks.  Still don't know why they appear to be coming from Man.  He
> probably should subscribe to the list though :-)

My semi-random guess is that Man is the admin of that Hudson instance,
judging by the mail headers in the list posts.

>> The mails from the weekend have made their way into the archives
>> now:
>>
>> http://mail.openjdk.java.net/pipermail/icedtea-test/2010-February/thread.html
>>
>> Unfortunately, there is nothing to see at toadeater:8080 - it seems
>> that a part of the Hudson instance URL is missing.
>>
> 
> It wouldn't help if it was complete as it's an internal machine.  Long
> term, it would be nice to move it to an external box but I don't know
> of any such resources.

Ah - I see, that makes sense. No rush - thanks for sharing the
Hudson instance's build results on the mailing lists.

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
Vorsitzender des Aufsichtsrates: Martin H?ring




From gnu_andrew at member.fsf.org  Mon Feb 22 04:13:05 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 22 Feb 2010 12:13:05 +0000
Subject: icedtea-test mailing list
In-Reply-To: <4B82728D.6020702@sun.com>
References: <17c6771e1002211123u1973d510w38756360fdd3f7db@mail.gmail.com>
	<1266786367.2479.13.camel@hermans.wildebeest.org>
	<17c6771e1002211317w6b9f82c4gd62899a65c3e82e3@mail.gmail.com>
	<4B8265AA.9000306@sun.com> <4B826CD2.30809@sun.com>
	<17c6771e1002220349j32a288dj71765441e5cb330f@mail.gmail.com>
	<4B82728D.6020702@sun.com>
Message-ID: <17c6771e1002220413g5ba846afsf33dac52e213e0b6@mail.gmail.com>

On 22 February 2010 12:03, Dalibor Topic <Dalibor.Topic at sun.com> wrote:
> Andrew John Hughes wrote:
>> On 22 February 2010 11:38, Dalibor Topic <Dalibor.Topic at sun.com> wrote:
>
>> Thanks. ?Still don't know why they appear to be coming from Man. ?He
>> probably should subscribe to the list though :-)
>
> My semi-random guess is that Man is the admin of that Hudson instance,
> judging by the mail headers in the list posts.
>

Ah found it and changed it to myself :-)

>>> The mails from the weekend have made their way into the archives
>>> now:
>>>
>>> http://mail.openjdk.java.net/pipermail/icedtea-test/2010-February/thread.html
>>>
>>> Unfortunately, there is nothing to see at toadeater:8080 - it seems
>>> that a part of the Hudson instance URL is missing.
>>>
>>
>> It wouldn't help if it was complete as it's an internal machine. ?Long
>> term, it would be nice to move it to an external box but I don't know
>> of any such resources.
>
> Ah - I see, that makes sense. No rush - thanks for sharing the
> Hudson instance's build results on the mailing lists.
>
> 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
> Vorsitzender des Aufsichtsrates: Martin H?ring
>
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 Feb 22 07:16:11 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 15:16:11 +0000
Subject: [Bug 447] New: Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed
	mode linux-amd64)
Message-ID: <E1Nja15-0007ol-VL@icedtea.classpath.org>

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

           Summary: Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed
                    mode linux-amd64)
           Product: IcedTea
           Version: unspecified
          Platform: 64-bit
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: AddVM
        AssignedTo: unassigned at icedtea.classpath.org
        ReportedBy: pratyush.pal at gmail.com


I am doing some Texture Design program using Java language with Jogl library in
3D. This is runtime error i am getting as 
"java.lang.IndexOutOfBoundsException: Required 196608 remaining bytes in
buffer, only had 0".
at
com.sun.gluegen.runtime.BufferFactory.rangeCheckBytes(BufferFactory.java:274)
        at com.sun.opengl.impl.GLImpl.glTexImage2D(GLImpl.java:21146)
        at
com.sun.opengl.impl.mipmap.BuildMipmap.gluBuild2DMipmapLevelsCore(BuildMipmap.java:321)
        at com.sun.opengl.impl.mipmap.Mipmap.gluBuild2DMipmaps(Mipmap.java:762)
        at javax.media.opengl.glu.GLU.gluBuild2DMipmapsJava(GLU.java:1525)
        at javax.media.opengl.glu.GLU.gluBuild2DMipmaps(GLU.java:1581)
        at TextureFactory.createTexture(TextureFactory.java:123)
        at TextureManager.createManagedTexture(TextureManager.java:39)
        at OpenglCore.init(OpenglCore.java:135)
        at com.sun.opengl.impl.GLDrawableHelper.init(GLDrawableHelper.java:72)
        at javax.media.opengl.GLCanvas$InitAction.run(GLCanvas.java:418)
        at
com.sun.opengl.impl.GLDrawableHelper.invokeGL(GLDrawableHelper.java:189)
        at
javax.media.opengl.GLCanvas.maybeDoSingleThreadedWorkaround(GLCanvas.java:412)
        at javax.media.opengl.GLCanvas.display(GLCanvas.java:244)
        at javax.media.opengl.GLCanvas.paint(GLCanvas.java:277)
        at sun.awt.RepaintArea.paintComponent(RepaintArea.java:264)
        at sun.awt.X11.XRepaintArea.paintComponent(XRepaintArea.java:73)
        at sun.awt.RepaintArea.paint(RepaintArea.java:240)
        at sun.awt.X11.XComponentPeer.handleEvent(XComponentPeer.java:702)
        at java.awt.Component.dispatchEventImpl(Component.java:4543)
        at java.awt.Component.dispatchEvent(Component.java:4293)
        at java.awt.EventQueue.dispatchEvent(EventQueue.java:604)
        at
java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:275)
        at
java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:200)
        at
java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
        at
java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:185)
        at
java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:177)
        at java.awt.EventDispatchThread.run(EventDispatchThread.java:138)


At end of the error message its showing 
"Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode linux-amd64)
# Problematic frame:
# C  [libGL.so.1+0x607e5]"

Any further information please let me know...


-- 
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 Feb 22 07:18:48 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 15:18:48 +0000
Subject: [Bug 447] Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode
	linux-amd64)
Message-ID: <E1Nja3c-0007p2-L7@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|AddVM                       |IcedTea6
           Platform|64-bit                      |x86_64
            Version|unspecified                 |6-1.2




------- Comment #1 from gnu_andrew at member.fsf.org  2010-02-22 15:18 -------
Can you check with a newer version?  This looks like 1.2, the current version
is 1.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  Mon Feb 22 07:19:15 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 15:19:15 +0000
Subject: [Bug 447] Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode
	linux-amd64)
Message-ID: <E1Nja43-0007pC-DM@icedtea.classpath.org>

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





------- Comment #2 from pratyush.pal at gmail.com  2010-02-22 15:19 -------
Created an attachment (id=300)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=300&action=view)
The attachment contain the details error reportwhich has logged by the system
itself.


-- 
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 Feb 22 07:20:28 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 15:20:28 +0000
Subject: [Bug 447] Java VM: OpenJDK 64-Bit Server VM (1.6.0_0-b11 mixed mode
	linux-amd64)
Message-ID: <E1Nja5E-0007pQ-Dy@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
    Attachment #300|application/octet-stream    |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 gnu_andrew at member.fsf.org  Mon Feb 22 07:31:06 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Mon, 22 Feb 2010 15:31:06 +0000
Subject: Howto switch local repo from icedtea to openjdk?
In-Reply-To: <194f62550912300552p749614a5u88245237dd4ed543@mail.gmail.com>
References: <194f62550912300552p749614a5u88245237dd4ed543@mail.gmail.com>
Message-ID: <17c6771e1002220731l5915e42ci1e7201d228322bb4@mail.gmail.com>

On 30 December 2009 13:52, Clemens Eisserer <linuxhippy at gmail.com> wrote:
> Hi,
>
> Some time ago I rebased the xrender pipeline on icedtea,
> because the OpenJDK repo didn't have some patches to make it build at
> that time. (arround jdk7m5)
>
> I tried to go back to the offcial OpenJDK repos, in order to make it
> easier getting the code upstream.
> Simply changing the repo-url didn't work as expected
> from: http://hg.openjdk.java.net/icedtea/jdk7/jdk/
> to: http://hg.openjdk.java.net/jdk7/jdk7/jdk/
>

Well there are seven of them altogether, jdk is just one.

> however executing:
> hg pull
> hg update
> hg merge
>
> Results in tons of files, which require manual merge.
>
> Is there an easy way to go back to openjdk repos,
> or do I have to manually merge all my stuff into a fresh local repo
> again (guess this is the 5-7x I am doing this)?
>

There shouldn't be that many differences between JDK7 and the IcedTea
forest, but there are some.  I'm going to start listing them here:

http://icedtea.classpath.org/wiki/IcedTea7_Forest_Patches

The idea is to migrate the patches from the IcedTea repositories
(where they have to be applied by every user) to being applied against
the upstream forest once and once only.
The IcedTea forest also tends to include security fixes earlier than upstream.

I would say the easiest way to switch back is to checkout jdk7, then
hg export -R <path to old repo> <changeset id> | hg import - each of
your changesets in your new checkout.

Is your tree public?

> Thank you in advance, Clemens
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 Feb 22 11:47:57 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 19:47:57 +0000
Subject: [Bug 34] Anti-aliased graphics
Message-ID: <E1NjeG5-0008H9-AQ@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |all




-- 
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 Feb 22 13:28:35 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:28:35 +0000
Subject: [Bug 112] Stendhal jar crashes with unexpected error
Message-ID: <E1NjfpT-000057-BZ@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|critical                    |normal
           Platform|other                       |x86_64
            Version|unspecified                 |7-1.5




-- 
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 Feb 22 13:29:20 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:29:20 +0000
Subject: [Bug 336] Add support for JSR-200 to javaws and appletviewer
Message-ID: <E1NjfqC-00005F-Lr@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|IcedTea6                    |NetX
           Platform|other                       |all




-- 
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 Feb 22 13:30:13 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:30:13 +0000
Subject: [Bug 46] Proper path widener
Message-ID: <E1Njfr3-00005U-5s@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|IcedTea6                    |Licensing
           Platform|other                       |all




-- 
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 Feb 22 13:31:08 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:31:08 +0000
Subject: [Bug 360] IDE crashes and can't continue
Message-ID: <E1Njfrw-00005Y-Ge@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86




-- 
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 Feb 22 13:31:30 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:31:30 +0000
Subject: [Bug 218] eclipse ganimede crash with open jdk 1.6 on fedora 9
Message-ID: <E1NjfsI-00005h-9i@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86
            Version|unspecified                 |6-1.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  Mon Feb 22 13:31:39 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:31:39 +0000
Subject: [Bug 218] eclipse ganimede crash with open jdk 1.6 on fedora 9
Message-ID: <E1NjfsR-00005q-MM@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Severity|blocker                     |normal




-- 
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 Feb 22 13:42:00 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:42:00 +0000
Subject: [Bug 311] JAVA-Based programs won't run and craches
Message-ID: <E1Njg2S-00006P-Ov@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86
            Version|unspecified                 |6-1.4




-- 
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 Feb 22 13:42:28 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:42:28 +0000
Subject: [Bug 128] SUN Virtual Toolkit for mobile apps crashes on Iced Tea JDKs
Message-ID: <E1Njg2u-00006W-4R@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86
            Version|unspecified                 |7-1.5




-- 
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 Feb 22 13:43:17 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:43:17 +0000
Subject: [Bug 180] JVM crash while running Eclipse 3.4 on Fedora 9 (x86_64)
Message-ID: <E1Njg3h-00006q-Pv@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |x86_64
            Version|unspecified                 |6-1.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 dbhole at icedtea.classpath.org  Mon Feb 22 13:54:38 2010
From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 21:54:38 +0000
Subject: /hg/icedtea6: Centralized and increased timeouts to give slow-lo...
Message-ID: <hg.b30c8301d479.1266875678.2873452341184383832@icedtea.classpath.org>

changeset b30c8301d479 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b30c8301d479
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Feb 22 16:54:32 2010 -0500

	Centralized and increased timeouts to give slow-loading applets
	enough time to load.


diffstat:

2 files changed, 11 insertions(+), 4 deletions(-)
ChangeLog                                                |    5 +++++
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |   10 ++++++----

diffs (60 lines):

diff -r 6571641c60ab -r b30c8301d479 ChangeLog
--- a/ChangeLog	Sun Feb 21 16:24:11 2010 +0100
+++ b/ChangeLog	Mon Feb 22 16:54:32 2010 -0500
@@ -1,3 +1,8 @@ 2010-02-21  Xerxes R??nby  <xerxes at zafen
+2010-02-22  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
+	and increased timeouts to give slow-loading applets enough time to load.
+
 2010-02-21  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
diff -r 6571641c60ab -r b30c8301d479 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Sun Feb 21 16:24:11 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Mon Feb 22 16:54:32 2010 -0500
@@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
          Applet a;
          
          // Wait for panel to come alive
-         int maxWait = 5000; // wait 5 seconds max for panel to come alive
+         int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
          int wait = 0;
          while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
               try {
@@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
      private long handle = 0;
      private WindowListener windowEventListener = null;
      private AppletEventListener appletEventListener = null;
+     
+     public static final int APPLET_TIMEOUT = 60000;
 
      /**
       * Null constructor to allow instantiation via newInstance()
@@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
                  if (message.startsWith("handle")) {
 
                      PluginDebug.debug("handle command waiting for applet to complete loading.");
-                     int maxWait = 10000; // wait 10 seconds max for applet to fully load
+                     int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
                      int wait = 0;
                      while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
                              (wait < maxWait)) {
@@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
          if (message.startsWith("width")) {
 
              // Wait for panel to come alive
-             int maxWait = 5000; // wait 5 seconds max for panel to come alive
+             int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
              int wait = 0;
              while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
                   try {
@@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
              Object o;
 
              // Wait for panel to come alive
-             int maxWait = 5000; // wait 5 seconds max for panel to come alive
+             int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
              int wait = 0;
              while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
                   try {


From bugzilla-daemon at icedtea.classpath.org  Mon Feb 22 14:15:34 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 22:15:34 +0000
Subject: [Bug 20] Implement DataStealer interface
Message-ID: <E1NjgYw-0001Xp-PI@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
          Component|IcedTea6                    |Licensing
           Platform|other                       |all




-- 
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 Feb 22 14:16:09 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 22:16:09 +0000
Subject: [Bug 22] java.util.Currency.getSymbol(Locale) returns wrong value
	when locale is not US.
Message-ID: <E1NjgZV-0001Xy-Jk@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |all




-- 
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 Feb 22 14:16:21 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Mon, 22 Feb 2010 22:16:21 +0000
Subject: [Bug 56] Rotated glyph placement
Message-ID: <E1NjgZh-0001Y6-MP@icedtea.classpath.org>

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


gnu_andrew at member.fsf.org changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
           Platform|other                       |all




-- 
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 icedtea.classpath.org  Tue Feb 23 01:01:42 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 09:01:42 +0000
Subject: /hg/icedtea6: Comment fix
Message-ID: <hg.fee30f40652c.1266915702.2873452341184383832@icedtea.classpath.org>

changeset fee30f40652c in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=fee30f40652c
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 09:01:28 2010 +0000

	Comment fix


diffstat:

2 files changed, 6 insertions(+), 2 deletions(-)
ChangeLog                                     |    4 ++++
ports/hotspot/make/linux/makefiles/shark.make |    4 ++--

diffs (31 lines):

diff -r b30c8301d479 -r fee30f40652c ChangeLog
--- a/ChangeLog	Mon Feb 22 16:54:32 2010 -0500
+++ b/ChangeLog	Tue Feb 23 09:01:28 2010 +0000
@@ -1,3 +1,7 @@ 2010-02-22  Deepak Bhole <dbhole at redhat.
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
 2010-02-22  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
diff -r b30c8301d479 -r fee30f40652c ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make	Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 09:01:28 2010 +0000
@@ -1,6 +1,6 @@
 #
 # Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2009 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 #  
 #
 
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
 
 TYPE = SHARK
 


From gnu_andrew at member.fsf.org  Tue Feb 23 04:00:49 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 23 Feb 2010 12:00:49 +0000
Subject: /hg/icedtea6: Centralized and increased timeouts to give 
	slow-lo...
In-Reply-To: <hg.b30c8301d479.1266875678.2873452341184383832@icedtea.classpath.org>
References: <hg.b30c8301d479.1266875678.2873452341184383832@icedtea.classpath.org>
Message-ID: <17c6771e1002230400i7ce4f472ue4038172391c9068@mail.gmail.com>

On 22 February 2010 21:54,  <dbhole at icedtea.classpath.org> wrote:
> changeset b30c8301d479 in /hg/icedtea6
> details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b30c8301d479
> author: Deepak Bhole <dbhole at redhat.com>
> date: Mon Feb 22 16:54:32 2010 -0500
>
> ? ? ? ?Centralized and increased timeouts to give slow-loading applets
> ? ? ? ?enough time to load.
>
>
> diffstat:
>
> 2 files changed, 11 insertions(+), 4 deletions(-)
> ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++++
> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | ? 10 ++++++----
>
> diffs (60 lines):
>
> diff -r 6571641c60ab -r b30c8301d479 ChangeLog
> --- a/ChangeLog Sun Feb 21 16:24:11 2010 +0100
> +++ b/ChangeLog Mon Feb 22 16:54:32 2010 -0500
> @@ -1,3 +1,8 @@ 2010-02-21 ?Xerxes R?nby ?<xerxes at zafen
> +2010-02-22 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
> + ? ? ? and increased timeouts to give slow-loading applets enough time to load.
> +
> ?2010-02-21 ?Xerxes R?nby ?<xerxes at zafena.se>
>
> ? ? ? ?* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
> diff -r 6571641c60ab -r b30c8301d479 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Sun Feb 21 16:24:11 2010 +0100
> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Mon Feb 22 16:54:32 2010 -0500
> @@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ? ? ?Applet a;
>
> ? ? ? ? ?// Wait for panel to come alive
> - ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> + ? ? ? ? int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
> ? ? ? ? ?int wait = 0;
> ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> ? ? ? ? ? ? ? try {
> @@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ?private long handle = 0;
> ? ? ?private WindowListener windowEventListener = null;
> ? ? ?private AppletEventListener appletEventListener = null;
> +
> + ? ? public static final int APPLET_TIMEOUT = 60000;
>
> ? ? ?/**
> ? ? ? * Null constructor to allow instantiation via newInstance()
> @@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ? ? ? ? ? ? ?if (message.startsWith("handle")) {
>
> ? ? ? ? ? ? ? ? ? ? ?PluginDebug.debug("handle command waiting for applet to complete loading.");
> - ? ? ? ? ? ? ? ? ? ? int maxWait = 10000; // wait 10 seconds max for applet to fully load
> + ? ? ? ? ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
> ? ? ? ? ? ? ? ? ? ? ?int wait = 0;
> ? ? ? ? ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?(wait < maxWait)) {
> @@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ? ? ?if (message.startsWith("width")) {
>
> ? ? ? ? ? ? ?// Wait for panel to come alive
> - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
> ? ? ? ? ? ? ?int wait = 0;
> ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
> ? ? ? ? ? ? ? ? ? try {
> @@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ? ? ? ? ?Object o;
>
> ? ? ? ? ? ? ?// Wait for panel to come alive
> - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
> ? ? ? ? ? ? ?int wait = 0;
> ? ? ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> ? ? ? ? ? ? ? ? ? try {
>

If there are plugin fixes you want in a 1.7.1 / gold plugin release,
then you need to be pushing them to the branch too.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 icedtea.classpath.org  Tue Feb 23 04:05:57 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 12:05:57 +0000
Subject: /hg/icedtea6: Add 2010 to some copyright headers that were missi...
Message-ID: <hg.9748785082e5.1266926757.2873452341184383832@icedtea.classpath.org>

changeset 9748785082e5 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9748785082e5
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 12:05:51 2010 +0000

	Add 2010 to some copyright headers that were missing it


diffstat:

5 files changed, 13 insertions(+), 8 deletions(-)
ChangeLog                                            |    7 +++++++
ports/hotspot/make/linux/makefiles/shark.make        |    2 +-
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp |    8 +++-----
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp   |    2 +-
ports/hotspot/src/share/vm/shark/sharkContext.hpp    |    2 +-

diffs (71 lines):

diff -r fee30f40652c -r 9748785082e5 ChangeLog
--- a/ChangeLog	Tue Feb 23 09:01:28 2010 +0000
+++ b/ChangeLog	Tue Feb 23 12:05:51 2010 +0000
@@ -1,3 +1,10 @@ 2010-02-23  Gary Benson  <gbenson at redhat
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
 2010-02-23  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
diff -r fee30f40652c -r 9748785082e5 ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 09:01:28 2010 +0000
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 12:05:51 2010 +0000
@@ -1,6 +1,6 @@
 #
 # Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2008, 2009 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
diff -r fee30f40652c -r 9748785082e5 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 09:01:28 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 12:05:51 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,8 @@
  *  
  */
 
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler.  See globals.hpp for details of what they do.
 
 define_pd_global(bool,  BackgroundCompilation,        true );
 define_pd_global(bool,  UseTLAB,                      true );
diff -r fee30f40652c -r 9748785082e5 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 23 09:01:28 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 23 12:05:51 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r fee30f40652c -r 9748785082e5 ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Tue Feb 23 09:01:28 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Tue Feb 23 12:05:51 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it


From dbhole at redhat.com  Tue Feb 23 07:20:07 2010
From: dbhole at redhat.com (Deepak Bhole)
Date: Tue, 23 Feb 2010 10:20:07 -0500
Subject: /hg/icedtea6: Centralized and increased timeouts to give
	slow-lo...
In-Reply-To: <17c6771e1002230400i7ce4f472ue4038172391c9068@mail.gmail.com>
References: <hg.b30c8301d479.1266875678.2873452341184383832@icedtea.classpath.org>
	<17c6771e1002230400i7ce4f472ue4038172391c9068@mail.gmail.com>
Message-ID: <20100223152007.GA19665@redhat.com>

* Andrew John Hughes <gnu_andrew at member.fsf.org> [2010-02-23 07:01]:
> On 22 February 2010 21:54,  <dbhole at icedtea.classpath.org> wrote:
> > changeset b30c8301d479 in /hg/icedtea6
> > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b30c8301d479
> > author: Deepak Bhole <dbhole at redhat.com>
> > date: Mon Feb 22 16:54:32 2010 -0500
> >
> > ? ? ? ?Centralized and increased timeouts to give slow-loading applets
> > ? ? ? ?enough time to load.
> >
> >
> > diffstat:
> >
> > 2 files changed, 11 insertions(+), 4 deletions(-)
> > ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++++
> > plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | ? 10 ++++++----
> >
> > diffs (60 lines):
> >
> > diff -r 6571641c60ab -r b30c8301d479 ChangeLog
> > --- a/ChangeLog Sun Feb 21 16:24:11 2010 +0100
> > +++ b/ChangeLog Mon Feb 22 16:54:32 2010 -0500
> > @@ -1,3 +1,8 @@ 2010-02-21 ?Xerxes R?nby ?<xerxes at zafen
> > +2010-02-22 ?Deepak Bhole <dbhole at redhat.com>
> > +
> > + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
> > + ? ? ? and increased timeouts to give slow-loading applets enough time to load.
> > +
> > ?2010-02-21 ?Xerxes R?nby ?<xerxes at zafena.se>
> >
> > ? ? ? ?* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
> > diff -r 6571641c60ab -r b30c8301d479 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
> > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Sun Feb 21 16:24:11 2010 +0100
> > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Mon Feb 22 16:54:32 2010 -0500
> > @@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> > ? ? ? ? ?Applet a;
> >
> > ? ? ? ? ?// Wait for panel to come alive
> > - ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> > + ? ? ? ? int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
> > ? ? ? ? ?int wait = 0;
> > ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> > ? ? ? ? ? ? ? try {
> > @@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> > ? ? ?private long handle = 0;
> > ? ? ?private WindowListener windowEventListener = null;
> > ? ? ?private AppletEventListener appletEventListener = null;
> > +
> > + ? ? public static final int APPLET_TIMEOUT = 60000;
> >
> > ? ? ?/**
> > ? ? ? * Null constructor to allow instantiation via newInstance()
> > @@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> > ? ? ? ? ? ? ? ? ?if (message.startsWith("handle")) {
> >
> > ? ? ? ? ? ? ? ? ? ? ?PluginDebug.debug("handle command waiting for applet to complete loading.");
> > - ? ? ? ? ? ? ? ? ? ? int maxWait = 10000; // wait 10 seconds max for applet to fully load
> > + ? ? ? ? ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
> > ? ? ? ? ? ? ? ? ? ? ?int wait = 0;
> > ? ? ? ? ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?(wait < maxWait)) {
> > @@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> > ? ? ? ? ?if (message.startsWith("width")) {
> >
> > ? ? ? ? ? ? ?// Wait for panel to come alive
> > - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> > + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
> > ? ? ? ? ? ? ?int wait = 0;
> > ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
> > ? ? ? ? ? ? ? ? ? try {
> > @@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> > ? ? ? ? ? ? ?Object o;
> >
> > ? ? ? ? ? ? ?// Wait for panel to come alive
> > - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> > + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
> > ? ? ? ? ? ? ?int wait = 0;
> > ? ? ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> > ? ? ? ? ? ? ? ? ? try {
> >
> 
> If there are plugin fixes you want in a 1.7.1 / gold plugin release,
> then you need to be pushing them to the branch too.


Yeah I know. There are a couple more in the pipeline I want in and I
will do a mass merge of the plugin code into 1.7 then.

Cheers,
Deepak

> -- 
> Andrew :-)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> 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  Tue Feb 23 07:34:13 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Tue, 23 Feb 2010 15:34:13 +0000
Subject: /hg/icedtea6: Centralized and increased timeouts to give 
	slow-lo...
In-Reply-To: <20100223152007.GA19665@redhat.com>
References: <hg.b30c8301d479.1266875678.2873452341184383832@icedtea.classpath.org>
	<17c6771e1002230400i7ce4f472ue4038172391c9068@mail.gmail.com>
	<20100223152007.GA19665@redhat.com>
Message-ID: <17c6771e1002230734r785185f0g3d8659cbe71fd3d@mail.gmail.com>

On 23 February 2010 15:20, Deepak Bhole <dbhole at redhat.com> wrote:
> * Andrew John Hughes <gnu_andrew at member.fsf.org> [2010-02-23 07:01]:
>> On 22 February 2010 21:54, ?<dbhole at icedtea.classpath.org> wrote:
>> > changeset b30c8301d479 in /hg/icedtea6
>> > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b30c8301d479
>> > author: Deepak Bhole <dbhole at redhat.com>
>> > date: Mon Feb 22 16:54:32 2010 -0500
>> >
>> > ? ? ? ?Centralized and increased timeouts to give slow-loading applets
>> > ? ? ? ?enough time to load.
>> >
>> >
>> > diffstat:
>> >
>> > 2 files changed, 11 insertions(+), 4 deletions(-)
>> > ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++++
>> > plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | ? 10 ++++++----
>> >
>> > diffs (60 lines):
>> >
>> > diff -r 6571641c60ab -r b30c8301d479 ChangeLog
>> > --- a/ChangeLog Sun Feb 21 16:24:11 2010 +0100
>> > +++ b/ChangeLog Mon Feb 22 16:54:32 2010 -0500
>> > @@ -1,3 +1,8 @@ 2010-02-21 ?Xerxes R?nby ?<xerxes at zafen
>> > +2010-02-22 ?Deepak Bhole <dbhole at redhat.com>
>> > +
>> > + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
>> > + ? ? ? and increased timeouts to give slow-loading applets enough time to load.
>> > +
>> > ?2010-02-21 ?Xerxes R?nby ?<xerxes at zafena.se>
>> >
>> > ? ? ? ?* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
>> > diff -r 6571641c60ab -r b30c8301d479 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
>> > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Sun Feb 21 16:24:11 2010 +0100
>> > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Mon Feb 22 16:54:32 2010 -0500
>> > @@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> > ? ? ? ? ?Applet a;
>> >
>> > ? ? ? ? ?// Wait for panel to come alive
>> > - ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
>> > + ? ? ? ? int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
>> > ? ? ? ? ?int wait = 0;
>> > ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
>> > ? ? ? ? ? ? ? try {
>> > @@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> > ? ? ?private long handle = 0;
>> > ? ? ?private WindowListener windowEventListener = null;
>> > ? ? ?private AppletEventListener appletEventListener = null;
>> > +
>> > + ? ? public static final int APPLET_TIMEOUT = 60000;
>> >
>> > ? ? ?/**
>> > ? ? ? * Null constructor to allow instantiation via newInstance()
>> > @@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> > ? ? ? ? ? ? ? ? ?if (message.startsWith("handle")) {
>> >
>> > ? ? ? ? ? ? ? ? ? ? ?PluginDebug.debug("handle command waiting for applet to complete loading.");
>> > - ? ? ? ? ? ? ? ? ? ? int maxWait = 10000; // wait 10 seconds max for applet to fully load
>> > + ? ? ? ? ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
>> > ? ? ? ? ? ? ? ? ? ? ?int wait = 0;
>> > ? ? ? ? ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
>> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?(wait < maxWait)) {
>> > @@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> > ? ? ? ? ?if (message.startsWith("width")) {
>> >
>> > ? ? ? ? ? ? ?// Wait for panel to come alive
>> > - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
>> > + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
>> > ? ? ? ? ? ? ?int wait = 0;
>> > ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
>> > ? ? ? ? ? ? ? ? ? try {
>> > @@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> > ? ? ? ? ? ? ?Object o;
>> >
>> > ? ? ? ? ? ? ?// Wait for panel to come alive
>> > - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
>> > + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
>> > ? ? ? ? ? ? ?int wait = 0;
>> > ? ? ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
>> > ? ? ? ? ? ? ? ? ? try {
>> >
>>
>> If there are plugin fixes you want in a 1.7.1 / gold plugin release,
>> then you need to be pushing them to the branch too.
>
>
> Yeah I know. There are a couple more in the pipeline I want in and I
> will do a mass merge of the plugin code into 1.7 then.
>
> Cheers,
> Deepak
>
>> --
>> Andrew :-)
>>
>> Free Java Software Engineer
>> Red Hat, Inc. (http://www.redhat.com)
>>
>> 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
>

When you do, can you make sure you port the changesets i.e. hg export
-R <path to head> <id> | hg import - in the 1.7 checkout.  It's easier
to track if they look the same.

It would be much easier if it wasn't for that damn ChangeLog!

Cheers,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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  Tue Feb 23 07:35:15 2010
From: dbhole at redhat.com (Deepak Bhole)
Date: Tue, 23 Feb 2010 10:35:15 -0500
Subject: /hg/icedtea6: Centralized and increased timeouts to give
	slow-lo...
In-Reply-To: <17c6771e1002230734r785185f0g3d8659cbe71fd3d@mail.gmail.com>
References: <hg.b30c8301d479.1266875678.2873452341184383832@icedtea.classpath.org>
	<17c6771e1002230400i7ce4f472ue4038172391c9068@mail.gmail.com>
	<20100223152007.GA19665@redhat.com>
	<17c6771e1002230734r785185f0g3d8659cbe71fd3d@mail.gmail.com>
Message-ID: <20100223153515.GB19665@redhat.com>

* Andrew John Hughes <gnu_andrew at member.fsf.org> [2010-02-23 10:34]:
> On 23 February 2010 15:20, Deepak Bhole <dbhole at redhat.com> wrote:
> > * Andrew John Hughes <gnu_andrew at member.fsf.org> [2010-02-23 07:01]:
> >> On 22 February 2010 21:54, ?<dbhole at icedtea.classpath.org> wrote:
> >> > changeset b30c8301d479 in /hg/icedtea6
> >> > details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b30c8301d479
> >> > author: Deepak Bhole <dbhole at redhat.com>
> >> > date: Mon Feb 22 16:54:32 2010 -0500
> >> >
> >> > ? ? ? ?Centralized and increased timeouts to give slow-loading applets
> >> > ? ? ? ?enough time to load.
> >> >
> >> >
> >> > diffstat:
> >> >
> >> > 2 files changed, 11 insertions(+), 4 deletions(-)
> >> > ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?5 +++++
> >> > plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | ? 10 ++++++----
> >> >
> >> > diffs (60 lines):
> >> >
> >> > diff -r 6571641c60ab -r b30c8301d479 ChangeLog
> >> > --- a/ChangeLog Sun Feb 21 16:24:11 2010 +0100
> >> > +++ b/ChangeLog Mon Feb 22 16:54:32 2010 -0500
> >> > @@ -1,3 +1,8 @@ 2010-02-21 ?Xerxes R?nby ?<xerxes at zafen
> >> > +2010-02-22 ?Deepak Bhole <dbhole at redhat.com>
> >> > +
> >> > + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
> >> > + ? ? ? and increased timeouts to give slow-loading applets enough time to load.
> >> > +
> >> > ?2010-02-21 ?Xerxes R?nby ?<xerxes at zafena.se>
> >> >
> >> > ? ? ? ?* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
> >> > diff -r 6571641c60ab -r b30c8301d479 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
> >> > --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Sun Feb 21 16:24:11 2010 +0100
> >> > +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Mon Feb 22 16:54:32 2010 -0500
> >> > @@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> >> > ? ? ? ? ?Applet a;
> >> >
> >> > ? ? ? ? ?// Wait for panel to come alive
> >> > - ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> >> > + ? ? ? ? int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
> >> > ? ? ? ? ?int wait = 0;
> >> > ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> >> > ? ? ? ? ? ? ? try {
> >> > @@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> >> > ? ? ?private long handle = 0;
> >> > ? ? ?private WindowListener windowEventListener = null;
> >> > ? ? ?private AppletEventListener appletEventListener = null;
> >> > +
> >> > + ? ? public static final int APPLET_TIMEOUT = 60000;
> >> >
> >> > ? ? ?/**
> >> > ? ? ? * Null constructor to allow instantiation via newInstance()
> >> > @@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> >> > ? ? ? ? ? ? ? ? ?if (message.startsWith("handle")) {
> >> >
> >> > ? ? ? ? ? ? ? ? ? ? ?PluginDebug.debug("handle command waiting for applet to complete loading.");
> >> > - ? ? ? ? ? ? ? ? ? ? int maxWait = 10000; // wait 10 seconds max for applet to fully load
> >> > + ? ? ? ? ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
> >> > ? ? ? ? ? ? ? ? ? ? ?int wait = 0;
> >> > ? ? ? ? ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
> >> > ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?(wait < maxWait)) {
> >> > @@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> >> > ? ? ? ? ?if (message.startsWith("width")) {
> >> >
> >> > ? ? ? ? ? ? ?// Wait for panel to come alive
> >> > - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> >> > + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
> >> > ? ? ? ? ? ? ?int wait = 0;
> >> > ? ? ? ? ? ? ?while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
> >> > ? ? ? ? ? ? ? ? ? try {
> >> > @@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> >> > ? ? ? ? ? ? ?Object o;
> >> >
> >> > ? ? ? ? ? ? ?// Wait for panel to come alive
> >> > - ? ? ? ? ? ? int maxWait = 5000; // wait 5 seconds max for panel to come alive
> >> > + ? ? ? ? ? ? int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
> >> > ? ? ? ? ? ? ?int wait = 0;
> >> > ? ? ? ? ? ? ?while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> >> > ? ? ? ? ? ? ? ? ? try {
> >> >
> >>
> >> If there are plugin fixes you want in a 1.7.1 / gold plugin release,
> >> then you need to be pushing them to the branch too.
> >
> >
> > Yeah I know. There are a couple more in the pipeline I want in and I
> > will do a mass merge of the plugin code into 1.7 then.
> >
> > Cheers,
> > Deepak
> >
> >> --
> >> Andrew :-)
> >>
> >> Free Java Software Engineer
> >> Red Hat, Inc. (http://www.redhat.com)
> >>
> >> 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
> >
> 
> When you do, can you make sure you port the changesets i.e. hg export
> -R <path to head> <id> | hg import - in the 1.7 checkout.  It's easier
> to track if they look the same.
> 
> It would be much easier if it wasn't for that damn ChangeLog!


Sure, will do!

Cheers,
Deepak

> 
> Cheers,
> -- 
> Andrew :-)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> 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 icedtea.classpath.org  Tue Feb 23 08:46:33 2010
From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 16:46:33 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.6692226bafb6.1266943593.2873452341184383832@icedtea.classpath.org>

changeset 6692226bafb6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6692226bafb6
author: Deepak Bhole <dbhole at redhat.com>
date: Mon Feb 22 17:53:44 2010 -0500

	- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi
	version.


changeset 1365cc7a840d in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1365cc7a840d
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Feb 23 11:46:21 2010 -0500

	Merge with main repo


diffstat:

7 files changed, 27 insertions(+), 11 deletions(-)
ChangeLog                                            |   17 +++++++++++++++++
Makefile.am                                          |    1 +
plugin/icedteanp/IcedTeaNPPlugin.cc                  |    4 ++--
ports/hotspot/make/linux/makefiles/shark.make        |    4 ++--
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp |    8 +++-----
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp   |    2 +-
ports/hotspot/src/share/vm/shark/sharkContext.hpp    |    2 +-

diffs (122 lines):

diff -r b30c8301d479 -r 1365cc7a840d ChangeLog
--- a/ChangeLog	Mon Feb 22 16:54:32 2010 -0500
+++ b/ChangeLog	Tue Feb 23 11:46:21 2010 -0500
@@ -1,3 +1,20 @@ 2010-02-22  Deepak Bhole <dbhole at redhat.
+2010-02-23  Deepak Bhole <dbhole at redhat.com>
+
+	* Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
+	jpi version.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
 2010-02-22  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
diff -r b30c8301d479 -r 1365cc7a840d Makefile.am
--- a/Makefile.am	Mon Feb 22 16:54:32 2010 -0500
+++ b/Makefile.am	Tue Feb 23 11:46:21 2010 -0500
@@ -1608,6 +1608,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 	mkdir -p $(NPPLUGIN_DIR) && \
 	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
+	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  $(GLIB_CFLAGS) \
diff -r b30c8301d479 -r 1365cc7a840d plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Mon Feb 22 16:54:32 2010 -0500
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Tue Feb 23 11:46:21 2010 -0500
@@ -107,7 +107,7 @@ exception statement from your version. *
   "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-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":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;"           \
@@ -123,7 +123,7 @@ exception statement from your version. *
   "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;"    \
+  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 
 #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make	Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 #
 # Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 #  
 #
 
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
 
 TYPE = SHARK
 
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,10 +23,8 @@
  *  
  */
 
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler.  See globals.hpp for details of what they do.
 
 define_pd_global(bool,  BackgroundCompilation,        true );
 define_pd_global(bool,  UseTLAB,                      true );
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008, 2009 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
diff -r b30c8301d479 -r 1365cc7a840d ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Mon Feb 22 16:54:32 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Tue Feb 23 11:46:21 2010 -0500
@@ -1,6 +1,6 @@
 /*
  * Copyright 1999-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2009 Red Hat, Inc.
+ * Copyright 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it


From gbenson at icedtea.classpath.org  Tue Feb 23 09:29:30 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 17:29:30 +0000
Subject: /hg/icedtea6: Reformat Shark to match upstream HotSpot
Message-ID: <hg.a9569f1ff015.1266946170.2873452341184383832@icedtea.classpath.org>

changeset a9569f1ff015 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a9569f1ff015
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 12:08:37 2010 -0500

	Reformat Shark to match upstream HotSpot


diffstat:

39 files changed, 706 insertions(+), 1340 deletions(-)
ChangeLog                                               |   42 +++
ports/hotspot/src/share/vm/shark/sharkBlock.cpp         |  111 ++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp         |   75 +----
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp       |  189 +++++----------
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp       |    6 
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp  |   63 +----
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp  |  123 +++------
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp    |   18 -
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp      |   26 --
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp      |   15 -
ports/hotspot/src/share/vm/shark/sharkConstant.cpp      |    9 
ports/hotspot/src/share/vm/shark/sharkConstant.hpp      |   12 
ports/hotspot/src/share/vm/shark/sharkContext.cpp       |   15 -
ports/hotspot/src/share/vm/shark/sharkContext.hpp       |   85 ++----
ports/hotspot/src/share/vm/shark/sharkEntry.hpp         |   21 -
ports/hotspot/src/share/vm/shark/sharkFunction.cpp      |   36 --
ports/hotspot/src/share/vm/shark/sharkFunction.hpp      |   33 --
ports/hotspot/src/share/vm/shark/sharkInliner.cpp       |   87 ++----
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp    |   30 --
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp    |    3 
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp    |    3 
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp    |   48 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp |   51 +---
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |   10 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |    3 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp |   66 +----
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp       |   32 --
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp       |   15 -
ports/hotspot/src/share/vm/shark/sharkStack.cpp         |   57 +---
ports/hotspot/src/share/vm/shark/sharkStack.hpp         |   84 ++----
ports/hotspot/src/share/vm/shark/sharkState.cpp         |   24 -
ports/hotspot/src/share/vm/shark/sharkState.hpp         |   63 +----
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp  |    9 
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp  |    3 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |  168 ++++---------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |  111 ++------
ports/hotspot/src/share/vm/shark/sharkType.hpp          |   75 +----
ports/hotspot/src/share/vm/shark/sharkValue.cpp         |  168 ++++---------
ports/hotspot/src/share/vm/shark/sharkValue.hpp         |   57 +---

diffs (truncated from 5206 to 500 lines):

diff -r 1365cc7a840d -r a9569f1ff015 ChangeLog
--- a/ChangeLog	Tue Feb 23 11:46:21 2010 -0500
+++ b/ChangeLog	Tue Feb 23 12:08:37 2010 -0500
@@ -1,3 +1,45 @@ 2010-02-23  Deepak Bhole <dbhole at redhat.
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
+	with trailing opening braces to match upstream HotSpot.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
 2010-02-23  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
diff -r 1365cc7a840d -r a9569f1ff015 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Feb 23 11:46:21 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Feb 23 12:08:37 2010 -0500
@@ -28,8 +28,7 @@
 
 using namespace llvm;
 
-void SharkBlock::parse_bytecode(int start, int limit)
-{
+void SharkBlock::parse_bytecode(int start, int limit) {
   SharkValue *a, *b, *c, *d;
   int i;
 
@@ -890,18 +889,15 @@ void SharkBlock::parse_bytecode(int star
   }
 }
 
-SharkState* SharkBlock::initial_current_state()
-{
+SharkState* SharkBlock::initial_current_state() {
   return entry_state()->copy();
 }
 
-int SharkBlock::switch_default_dest()
-{
+int SharkBlock::switch_default_dest() {
   return iter()->get_dest_table(0);
 }
 
-int SharkBlock::switch_table_length()
-{
+int SharkBlock::switch_table_length() {
   switch(bc()) {
   case Bytecodes::_tableswitch:
     return iter()->get_int_table(2) - iter()->get_int_table(1) + 1;
@@ -914,8 +910,7 @@ int SharkBlock::switch_table_length()
   } 
 }
 
-int SharkBlock::switch_key(int i)
-{
+int SharkBlock::switch_key(int i) {
   switch(bc()) {
   case Bytecodes::_tableswitch:
     return iter()->get_int_table(1) + i;
@@ -928,8 +923,7 @@ int SharkBlock::switch_key(int i)
   } 
 }
 
-int SharkBlock::switch_dest(int i)
-{
+int SharkBlock::switch_dest(int i) {
   switch(bc()) {
   case Bytecodes::_tableswitch:
     return iter()->get_dest_table(i + 3);
@@ -942,8 +936,7 @@ int SharkBlock::switch_dest(int i)
   } 
 }
 
-void SharkBlock::do_div_or_rem(bool is_long, bool is_rem)
-{
+void SharkBlock::do_div_or_rem(bool is_long, bool is_rem) {
   SharkValue *sb = pop();
   SharkValue *sa = pop();
 
@@ -1010,8 +1003,7 @@ void SharkBlock::do_div_or_rem(bool is_l
     push(SharkValue::create_jint(result, false));
 }
 
-void SharkBlock::do_field_access(bool is_get, bool is_field)
-{
+void SharkBlock::do_field_access(bool is_get, bool is_field) {
   bool will_link;
   ciField *field = iter()->get_field(will_link);
   assert(will_link, "typeflow responsibility");
@@ -1079,8 +1071,7 @@ void SharkBlock::do_field_access(bool is
     push(value);
 }
 
-void SharkBlock::do_lcmp()
-{
+void SharkBlock::do_lcmp() {
   Value *b = pop()->jlong_value();
   Value *a = pop()->jlong_value();
 
@@ -1111,8 +1102,7 @@ void SharkBlock::do_lcmp()
   push(SharkValue::create_jint(result, false));
 }
 
-void SharkBlock::do_fcmp(bool is_double, bool unordered_is_greater)
-{
+void SharkBlock::do_fcmp(bool is_double, bool unordered_is_greater) {
   Value *a, *b;
   if (is_double) {
     b = pop()->jdouble_value();
@@ -1159,137 +1149,110 @@ void SharkBlock::do_fcmp(bool is_double,
   push(SharkValue::create_jint(result, false));
 }
 
-void SharkBlock::emit_IR()
-{
+void SharkBlock::emit_IR() {
   ShouldNotCallThis();
 }
 
-SharkState* SharkBlock::entry_state()
-{
+SharkState* SharkBlock::entry_state() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_zero_check(SharkValue* value)
-{
+void SharkBlock::do_zero_check(SharkValue* value) {
   ShouldNotCallThis();
 }
 
-void SharkBlock::maybe_add_backedge_safepoint()
-{
+void SharkBlock::maybe_add_backedge_safepoint() {
   ShouldNotCallThis();
 }
 
-bool SharkBlock::has_trap()
-{
+bool SharkBlock::has_trap() {
   return false;
 }
 
-int SharkBlock::trap_request()
-{
+int SharkBlock::trap_request() {
   ShouldNotCallThis();
 }
 
-int SharkBlock::trap_bci()
-{
+int SharkBlock::trap_bci() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_trap(int trap_request)
-{
+void SharkBlock::do_trap(int trap_request) {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_arraylength()
-{
+void SharkBlock::do_arraylength() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_aload(BasicType basic_type)
-{
+void SharkBlock::do_aload(BasicType basic_type) {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_astore(BasicType basic_type)
-{
+void SharkBlock::do_astore(BasicType basic_type) {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_return(BasicType type)
-{
+void SharkBlock::do_return(BasicType type) {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_athrow()
-{
+void SharkBlock::do_athrow() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_goto()
-{
+void SharkBlock::do_goto() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_jsr()
-{
+void SharkBlock::do_jsr() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_ret()
-{
+void SharkBlock::do_ret() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_if(ICmpInst::Predicate p, SharkValue* b, SharkValue* a)
-{
+void SharkBlock::do_if(ICmpInst::Predicate p, SharkValue* b, SharkValue* a) {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_switch()
-{
+void SharkBlock::do_switch() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_call()
-{
+void SharkBlock::do_call() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_instance_check()
-{
+void SharkBlock::do_instance_check() {
   ShouldNotCallThis();
 }
 
-bool SharkBlock::maybe_do_instanceof_if()
-{
+bool SharkBlock::maybe_do_instanceof_if() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_new()
-{
+void SharkBlock::do_new() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_newarray()
-{
+void SharkBlock::do_newarray() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_anewarray()
-{
+void SharkBlock::do_anewarray() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_multianewarray()
-{
+void SharkBlock::do_multianewarray() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_monitorenter()
-{
+void SharkBlock::do_monitorenter() {
   ShouldNotCallThis();
 }
 
-void SharkBlock::do_monitorexit()
-{
+void SharkBlock::do_monitorexit() {
   ShouldNotCallThis();
 }
diff -r 1365cc7a840d -r a9569f1ff015 ports/hotspot/src/share/vm/shark/sharkBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Feb 23 11:46:21 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Feb 23 12:08:37 2010 -0500
@@ -42,16 +42,13 @@ class SharkBlock : public SharkTargetInv
   SharkState*      _current_state;
 
  public:
-  ciBytecodeStream* iter()
-  {
+  ciBytecodeStream* iter() {
     return &_iter;
   }
-  Bytecodes::Code bc()
-  {
+  Bytecodes::Code bc() {
     return iter()->cur_bc();
   }
-  int bci()
-  {
+  int bci() {
     return iter()->cur_bci();
   }
 
@@ -64,23 +61,20 @@ class SharkBlock : public SharkTargetInv
   SharkState* initial_current_state();
   
  public:
-  SharkState* current_state()
-  {
+  SharkState* current_state() {
     if (_current_state == NULL)
       set_current_state(initial_current_state());
     return _current_state;
   }
 
  protected:
-  void set_current_state(SharkState* current_state)
-  {
+  void set_current_state(SharkState* current_state) {
     _current_state = current_state;
   }
 
   // Local variables  
  protected:
-  SharkValue* local(int index)
-  {
+  SharkValue* local(int index) {
     SharkValue *value = current_state()->local(index);
     assert(value != NULL, "shouldn't be");
     assert(value->is_one_word() ||
@@ -88,8 +82,7 @@ class SharkBlock : public SharkTargetInv
             current_state()->local(index + 1) == NULL), "should be");
     return value;
   }
-  void set_local(int index, SharkValue* value)
-  {
+  void set_local(int index, SharkValue* value) {
     assert(value != NULL, "shouldn't be");
     current_state()->set_local(index, value);
     if (value->is_two_word())
@@ -98,16 +91,13 @@ class SharkBlock : public SharkTargetInv
 
   // Expression stack (raw)
  protected:
-  void xpush(SharkValue* value)
-  {
+  void xpush(SharkValue* value) {
     current_state()->push(value);
   }
-  SharkValue* xpop()
-  {
+  SharkValue* xpop() {
     return current_state()->pop();
   }
-  SharkValue* xstack(int slot)
-  {
+  SharkValue* xstack(int slot) {
     SharkValue *value = current_state()->stack(slot);
     assert(value != NULL, "shouldn't be");
     assert(value->is_one_word() ||
@@ -115,22 +105,19 @@ class SharkBlock : public SharkTargetInv
             current_state()->stack(slot - 1) == NULL), "should be");
     return value;
   }
-  int xstack_depth()
-  {
+  int xstack_depth() {
     return current_state()->stack_depth();
   }
 
   // Expression stack (cooked)
  protected:
-  void push(SharkValue* value)
-  {
+  void push(SharkValue* value) {
     assert(value != NULL, "shouldn't be");
     xpush(value);
     if (value->is_two_word())
       xpush(NULL);
   }
-  SharkValue* pop()
-  {
+  SharkValue* pop() {
     int size = current_state()->stack(0) == NULL ? 2 : 1;
     if (size == 2)
       xpop();
@@ -138,8 +125,7 @@ class SharkBlock : public SharkTargetInv
     assert(value && value->size() == size, "should be");
     return value;
   }
-  SharkValue* pop_result(BasicType type)
-  {
+  SharkValue* pop_result(BasicType type) {
     SharkValue *result = pop();
 
 #ifdef ASSERT
@@ -176,17 +162,14 @@ class SharkBlock : public SharkTargetInv
 
   // Zero checking
  protected:
-  void check_null(SharkValue* object)
-  {
+  void check_null(SharkValue* object) {
     zero_check(object);
   }
-  void check_divide_by_zero(SharkValue* value)
-  {
+  void check_divide_by_zero(SharkValue* value) {
     zero_check(value);
   }
  private:
-  void zero_check(SharkValue* value)
-  {
+  void zero_check(SharkValue* value) {
     if (!value->zero_checked())
       do_zero_check(value);
   }
@@ -213,40 +196,32 @@ class SharkBlock : public SharkTargetInv
 
   // *div and *rem
  private:
-  void do_idiv()
-  {
+  void do_idiv() {
     do_div_or_rem(false, false);
   }
-  void do_irem()
-  {
+  void do_irem() {
     do_div_or_rem(false, true);
   }
-  void do_ldiv()
-  {
+  void do_ldiv() {
     do_div_or_rem(true, false);
   }
-  void do_lrem()
-  {
+  void do_lrem() {
     do_div_or_rem(true, true);
   }
   void do_div_or_rem(bool is_long, bool is_rem);  
 
   // get* and put*
  private:
-  void do_getstatic()
-  {
+  void do_getstatic() {
     do_field_access(true, false);
   }
-  void do_getfield()
-  {
+  void do_getfield() {
     do_field_access(true, true);
   }
-  void do_putstatic()
-  {
+  void do_putstatic() {
     do_field_access(false, false);
   }
-  void do_putfield()
-  {
+  void do_putfield() {
     do_field_access(false, true);
   }
   void do_field_access(bool is_get, bool is_field);
diff -r 1365cc7a840d -r a9569f1ff015 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Feb 23 11:46:21 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Feb 23 12:08:37 2010 -0500
@@ -30,24 +30,21 @@ using namespace llvm;
 


From gbenson at icedtea.classpath.org  Tue Feb 23 09:37:05 2010
From: gbenson at icedtea.classpath.org (gbenson at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 17:37:05 +0000
Subject: /hg/icedtea6: Whitespace fixes
Message-ID: <hg.2b86a59d4446.1266946625.2873452341184383832@icedtea.classpath.org>

changeset 2b86a59d4446 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2b86a59d4446
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 17:36:57 2010 +0000

	Whitespace fixes


diffstat:

33 files changed, 181 insertions(+), 146 deletions(-)
ChangeLog                                               |   35 +++++++++
ports/hotspot/make/linux/makefiles/shark.make           |    2 
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp    |    4 -
ports/hotspot/src/share/vm/includeDB_shark              |    2 
ports/hotspot/src/share/vm/shark/sharkBlock.cpp         |   46 ++++++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp         |   10 +-
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp       |    4 -
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp       |    8 +-
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp  |    4 -
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp  |    6 -
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp      |   10 +-
ports/hotspot/src/share/vm/shark/sharkContext.cpp       |    2 
ports/hotspot/src/share/vm/shark/sharkContext.hpp       |    2 
ports/hotspot/src/share/vm/shark/sharkFunction.cpp      |   10 +-
ports/hotspot/src/share/vm/shark/sharkFunction.hpp      |    4 -
ports/hotspot/src/share/vm/shark/sharkInliner.cpp       |   20 ++---
ports/hotspot/src/share/vm/shark/sharkInliner.hpp       |    2 
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp    |    4 -
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp    |    2 
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp |    2 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp |   14 +--
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp |    2 
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp       |   20 ++---
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp       |    4 -
ports/hotspot/src/share/vm/shark/sharkStack.cpp         |    8 +-
ports/hotspot/src/share/vm/shark/sharkStack.hpp         |    8 +-
ports/hotspot/src/share/vm/shark/sharkState.cpp         |   18 ++---
ports/hotspot/src/share/vm/shark/sharkState.hpp         |    2 
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp  |    4 -
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp  |    2 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp |   54 +++++++--------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp |    4 -
ports/hotspot/src/share/vm/shark/sharkValue.hpp         |    8 +-

diffs (truncated from 1359 to 500 lines):

diff -r a9569f1ff015 -r 2b86a59d4446 ChangeLog
--- a/ChangeLog	Tue Feb 23 12:08:37 2010 -0500
+++ b/ChangeLog	Tue Feb 23 17:36:57 2010 +0000
@@ -1,3 +1,38 @@ 2010-02-23  Gary Benson  <gbenson at redhat
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
 2010-02-23  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
 # 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.
-#  
+#
 #
 
 # Sets make macros for making Shark version of VM
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
  * 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.
- *  
+ *
  */
 
 // Set the default values for platform dependent flags used by the
@@ -50,7 +50,7 @@ define_pd_global(intx,  NewRatio,       
 define_pd_global(intx,  NewRatio,                     12   );
 define_pd_global(intx,  NewSizeThreadIncrease,        4*K  );
 define_pd_global(intx,  InitialCodeCacheSize,         160*K);
-define_pd_global(intx,  ReservedCodeCacheSize,        32*M ); 
+define_pd_global(intx,  ReservedCodeCacheSize,        32*M );
 define_pd_global(bool,  ProfileInterpreter,           false);
 define_pd_global(intx,  CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,      1    );
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
 // 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.
-//  
+//
 //
 
 // NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -44,7 +44,7 @@ void SharkBlock::parse_bytecode(int star
 
     if (SharkTraceBytecodes)
       tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc()));
-    
+
     if (has_trap() && trap_bci() == bci()) {
       do_trap(trap_request());
       return;
@@ -95,7 +95,7 @@ void SharkBlock::parse_bytecode(int star
           }
         }
         break;
-      }  
+      }
     }
 
     switch (bc()) {
@@ -294,25 +294,25 @@ void SharkBlock::parse_bytecode(int star
       xpop();
       xpop();
       break;
-    case Bytecodes::_swap: 
+    case Bytecodes::_swap:
       a = xpop();
       b = xpop();
       xpush(a);
       xpush(b);
-      break;  
+      break;
     case Bytecodes::_dup:
       a = xpop();
       xpush(a);
       xpush(a);
       break;
-    case Bytecodes::_dup_x1: 
+    case Bytecodes::_dup_x1:
       a = xpop();
       b = xpop();
       xpush(a);
       xpush(b);
       xpush(a);
       break;
-    case Bytecodes::_dup_x2: 
+    case Bytecodes::_dup_x2:
       a = xpop();
       b = xpop();
       c = xpop();
@@ -321,7 +321,7 @@ void SharkBlock::parse_bytecode(int star
       xpush(b);
       xpush(a);
       break;
-    case Bytecodes::_dup2: 
+    case Bytecodes::_dup2:
       a = xpop();
       b = xpop();
       xpush(b);
@@ -394,7 +394,7 @@ void SharkBlock::parse_bytecode(int star
       do_irem();
       break;
     case Bytecodes::_ineg:
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jint(
         builder()->CreateNeg(a->jint_value()), a->zero_checked()));
       break;
@@ -470,7 +470,7 @@ void SharkBlock::parse_bytecode(int star
       do_lrem();
       break;
     case Bytecodes::_lneg:
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jlong(
         builder()->CreateNeg(a->jlong_value()), a->zero_checked()));
       break;
@@ -547,18 +547,18 @@ void SharkBlock::parse_bytecode(int star
       break;
     case Bytecodes::_fdiv:
       b = pop();
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jfloat(
         builder()->CreateFDiv(a->jfloat_value(), b->jfloat_value())));
       break;
     case Bytecodes::_frem:
       b = pop();
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jfloat(
         builder()->CreateFRem(a->jfloat_value(), b->jfloat_value())));
       break;
     case Bytecodes::_fneg:
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jfloat(
         builder()->CreateFNeg(a->jfloat_value())));
       break;
@@ -583,18 +583,18 @@ void SharkBlock::parse_bytecode(int star
       break;
     case Bytecodes::_ddiv:
       b = pop();
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jdouble(
         builder()->CreateFDiv(a->jdouble_value(), b->jdouble_value())));
       break;
     case Bytecodes::_drem:
       b = pop();
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jdouble(
         builder()->CreateFRem(a->jdouble_value(), b->jdouble_value())));
       break;
     case Bytecodes::_dneg:
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jdouble(
         builder()->CreateFNeg(a->jdouble_value())));
       break;
@@ -627,7 +627,7 @@ void SharkBlock::parse_bytecode(int star
       break;
 
     case Bytecodes::_i2l:
-      a = pop();      
+      a = pop();
       push(SharkValue::create_jlong(
         builder()->CreateIntCast(
           a->jint_value(), SharkType::jlong_type(), true), a->zero_checked()));
@@ -907,7 +907,7 @@ int SharkBlock::switch_table_length() {
 
   default:
     ShouldNotReachHere();
-  } 
+  }
 }
 
 int SharkBlock::switch_key(int i) {
@@ -920,7 +920,7 @@ int SharkBlock::switch_key(int i) {
 
   default:
     ShouldNotReachHere();
-  } 
+  }
 }
 
 int SharkBlock::switch_dest(int i) {
@@ -933,7 +933,7 @@ int SharkBlock::switch_dest(int i) {
 
   default:
     ShouldNotReachHere();
-  } 
+  }
 }
 
 void SharkBlock::do_div_or_rem(bool is_long, bool is_rem) {
@@ -966,7 +966,7 @@ void SharkBlock::do_div_or_rem(bool is_l
       builder()->CreateICmpEQ(a, p),
       builder()->CreateICmpEQ(b, q)),
     special_case, general_case);
-  
+
   builder()->SetInsertPoint(special_case);
   Value *special_result;
   if (is_rem) {
@@ -1033,12 +1033,12 @@ void SharkBlock::do_field_access(bool is
     BasicType   basic_type = field->type()->basic_type();
     const Type *stack_type = SharkType::to_stackType(basic_type);
     const Type *field_type = SharkType::to_arrayType(basic_type);
-    
+
     Value *addr = builder()->CreateAddressOfStructEntry(
       object, in_ByteSize(field->offset_in_bytes()),
       PointerType::getUnqual(field_type),
       "addr");
-  
+
     // Do the access
     if (is_get) {
       Value *field_value = builder()->CreateLoad(addr);
@@ -1057,7 +1057,7 @@ void SharkBlock::do_field_access(bool is
           field_value, field_type, basic_type != T_CHAR);
 
       builder()->CreateStore(field_value, addr);
-      
+
       if (!field->type()->is_primitive_type())
         builder()->CreateUpdateBarrierSet(oopDesc::bs(), addr);
 
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkBlock.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -55,11 +55,11 @@ class SharkBlock : public SharkTargetInv
   // Entry state
  protected:
   virtual SharkState* entry_state();
-  
+
   // Current state
  private:
   SharkState* initial_current_state();
-  
+
  public:
   SharkState* current_state() {
     if (_current_state == NULL)
@@ -72,7 +72,7 @@ class SharkBlock : public SharkTargetInv
     _current_state = current_state;
   }
 
-  // Local variables  
+  // Local variables
  protected:
   SharkValue* local(int index) {
     SharkValue *value = current_state()->local(index);
@@ -208,7 +208,7 @@ class SharkBlock : public SharkTargetInv
   void do_lrem() {
     do_div_or_rem(true, true);
   }
-  void do_div_or_rem(bool is_long, bool is_rem);  
+  void do_div_or_rem(bool is_long, bool is_rem);
 
   // get* and put*
  private:
@@ -257,7 +257,7 @@ class SharkBlock : public SharkTargetInv
   int switch_dest(int i);
 
   virtual void do_switch();
-  
+
   // invoke*
  protected:
   virtual void do_call();
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -127,7 +127,7 @@ const Type* SharkBuilder::make_type(char
   case 'F':
   case 'D':
     return PointerType::getUnqual(make_type(tolower(type), false));
-    
+
     // VM objects
   case 'T':
     return SharkType::thread_type();
@@ -535,4 +535,4 @@ BasicBlock* SharkBuilder::CreateBlock(Ba
 BasicBlock* SharkBuilder::CreateBlock(BasicBlock* ip, const char* name) const {
   return BasicBlock::Create(
     SharkContext::current(), name, GetInsertBlock()->getParent(), ip);
-}  
+}
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkBuilder.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -149,7 +149,7 @@ class SharkBuilder : public llvm::IRBuil
   llvm::Value* memset();
   llvm::Value* unimplemented();
   llvm::Value* should_not_reach_here();
-  llvm::Value* dump();  
+  llvm::Value* dump();
 
   // Public interface to low-level non-VM calls.
  public:
@@ -164,10 +164,10 @@ class SharkBuilder : public llvm::IRBuil
                                llvm::Value* value,
                                llvm::Value* len,
                                llvm::Value* align);
-  llvm::CallInst* CreateUnimplemented(const char* file, int line);  
-  llvm::CallInst* CreateShouldNotReachHere(const char* file, int line);  
+  llvm::CallInst* CreateUnimplemented(const char* file, int line);
+  llvm::CallInst* CreateShouldNotReachHere(const char* file, int line);
   NOT_PRODUCT(llvm::CallInst* CreateDump(llvm::Value* value));
-  
+
   // Flags for CreateMemoryBarrier.
  public:
   enum BarrierFlags {
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -105,7 +105,7 @@ void SharkDecacher::process_method_slot(
     *value,
     offset);
 
-  oopmap()->set_oop(slot2reg(offset));  
+  oopmap()->set_oop(slot2reg(offset));
 }
 
 void SharkDecacher::process_pc_slot(int offset) {
@@ -114,7 +114,7 @@ void SharkDecacher::process_pc_slot(int 
     builder()->code_buffer_address(pc_offset()),
     stack()->slot_addr(offset));
 }
-  
+
 void SharkDecacher::start_locals() {
   // Create the array we'll record our local variables in
   _locarray = new GrowableArray<ScopeValue*>(max_locals());}
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -58,7 +58,7 @@ class SharkDecacher : public SharkCacher
 
  private:
   int _bci;
-  
+
  protected:
   int bci() const {
     return _bci;
@@ -101,7 +101,7 @@ class SharkDecacher : public SharkCacher
   void process_oop_tmp_slot(llvm::Value** value, int offset);
   void process_method_slot(llvm::Value** value, int offset);
   void process_pc_slot(int offset);
-  
+
   void start_locals();
   void process_local_slot(int index, SharkValue** value, int offset);
 
@@ -131,7 +131,7 @@ class SharkDecacher : public SharkCacher
     //   stack[3]    local[0]    jint       normal    normal
     //
     // high addresses this end
-    
+
     SharkValue *value = *addr;
     if (value) {
       if (value->is_jobject())
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -48,7 +48,7 @@ SharkCompiler::SharkCompiler()
   MutexLocker locker(execution_engine_lock());
 
   // Make LLVM safe for multithreading
-  if (!llvm_start_multithreaded()) 
+  if (!llvm_start_multithreaded())
     fatal("llvm_start_multithreaded() failed");
 
   // Initialize the native target
@@ -161,7 +161,7 @@ void SharkCompiler::compile_method(ciEnv
 
   // Emit the entry point
   SharkEntry *entry = (SharkEntry *) cb.malloc(sizeof(SharkEntry));
-  
+
   // Build the LLVM IR for the method
   Function *function = SharkFunction::build(env, &builder, flow, name);
 
@@ -182,7 +182,7 @@ void SharkCompiler::compile_method(ciEnv
 
   ExceptionHandlerTable handler_table;
   ImplicitExceptionTable inc_table;
-  
+
   env->register_method(target,
                        entry_bci,
                        &offsets,
@@ -255,7 +255,7 @@ void SharkCompiler::generate_native_code
         llvm::DebugFlag = true;
       }
       else {
-        llvm::SetCurrentDebugType(""); 
+        llvm::SetCurrentDebugType("");
         llvm::DebugFlag = false;
       }
 #else
@@ -314,7 +314,7 @@ void SharkCompiler::free_queued_methods(
       break;
 
     execution_engine()->freeMachineCodeForFunction(function);
-    function->eraseFromParent();  
+    function->eraseFromParent();
   }
 }
 
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkContext.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.cpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -92,7 +92,7 @@ SharkContext::SharkContext(const char* n
       _to_stackType[i] = jint_type();
       _to_arrayType[i] = jbyte_type();
       break;
-      
+
     case T_BYTE:
       _to_stackType[i] = jint_type();
       _to_arrayType[i] = jbyte_type();
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkContext.hpp
--- a/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkContext.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -168,7 +168,7 @@ class SharkContext : public llvm::LLVMCo
     assert(type != NULL, "unhandled type");
     return result;
   }
-  
+
  public:
   const llvm::Type* to_stackType(BasicType type) const {
     return map_type(_to_stackType, type);
diff -r a9569f1ff015 -r 2b86a59d4446 ports/hotspot/src/share/vm/shark/sharkFunction.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Tue Feb 23 12:08:37 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkFunction.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -97,10 +97,10 @@ void SharkFunction::initialize(const cha
       SharkTopLevelBlock *locker =
         new SharkTopLevelBlock(this, start_block->ciblock());
       locker->add_incoming(entry_state);
-    
+
       set_block_insertion_point(start_block->entry_block());
       locker->acquire_method_lock();


From gbenson at redhat.com  Tue Feb 23 09:40:11 2010
From: gbenson at redhat.com (Gary Benson)
Date: Tue, 23 Feb 2010 17:40:11 +0000
Subject: Shark tidy ups
Message-ID: <20100223174011.GC3358@redhat.com>

Hi all,

The three commits I just made reformat Shark to match upstream
HotSpot.  There are no code changes, just whitespace and moved
braces.

Cheers,
Gary

-- 
http://gbenson.net/


From bugzilla-daemon at icedtea.classpath.org  Tue Feb 23 12:18:04 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 20:18:04 +0000
Subject: [Bug 322] Thread#GetContextClassLoader() throws in IcedTeaPlugin
Message-ID: <E1Nk1Cm-0008Df-Oj@icedtea.classpath.org>

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


dbhole at redhat.com changed:

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




------- Comment #6 from dbhole at redhat.com  2010-02-23 20:18 -------
Fixed in the new NP plugin. The loaders now mimic what the Sun plugin does, and
the code mentioned in the original bug report now runs correctly.


-- 
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 Feb 23 12:23:50 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Tue, 23 Feb 2010 20:23:50 +0000
Subject: [Bug 427] Openjdk doesn't load a scratch-ticket on a HP Compaq
	Presario CQ60-laptop.
Message-ID: <E1Nk1IM-0008Dv-RK@icedtea.classpath.org>

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


dbhole at redhat.com changed:

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




------- Comment #5 from dbhole at redhat.com  2010-02-23 20:23 -------
I cannot reproduce this, and therefore have to close it due to insufficient
data.

Please feel free to re-open when you have the logs mentioned in comment #1 or
need further instructions on how to get the logs.


-- 
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 ptisnovs at icedtea.classpath.org  Wed Feb 24 07:35:55 2010
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 15:35:55 +0000
Subject: /hg/release/icedtea6-1.7: Corrected PulseAudio library build
Message-ID: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>

changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
author: ptisnovs
date: Wed Feb 24 16:34:02 2010 +0100

	Corrected PulseAudio library build


diffstat:

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

diffs (22 lines):

diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
--- a/ChangeLog	Wed Jan 27 18:38:33 2010 +0000
+++ b/ChangeLog	Wed Feb 24 16:34:02 2010 +0100
@@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes  <ahughes@
+2010-02-24 Pavel Tisnovsky  <ptisnovs at redhat.com>
+	* Makefile.am: Corrected Pulse Audio
+	library build
+
 2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Reference plugin
diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
--- a/Makefile.am	Wed Jan 27 18:38:33 2010 +0000
+++ b/Makefile.am	Wed Feb 24 16:34:02 2010 +0100
@@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
 	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
+	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
 	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
 endif
 	mkdir -p stamps


From gnu_andrew at member.fsf.org  Wed Feb 24 07:57:31 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 24 Feb 2010 15:57:31 +0000
Subject: /hg/release/icedtea6-1.7: Corrected PulseAudio library build
In-Reply-To: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>
References: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>
Message-ID: <17c6771e1002240757t3a3ff2b6o3d41d35e533cdc8a@mail.gmail.com>

On 24 February 2010 15:35,  <ptisnovs at icedtea.classpath.org> wrote:
> changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
> author: ptisnovs
> date: Wed Feb 24 16:34:02 2010 +0100
>
> ? ? ? ?Corrected PulseAudio library build
>
>
> diffstat:
>
> 2 files changed, 5 insertions(+)
> ChangeLog ? | ? ?4 ++++
> Makefile.am | ? ?1 +
>
> diffs (22 lines):
>
> diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
> --- a/ChangeLog Wed Jan 27 18:38:33 2010 +0000
> +++ b/ChangeLog Wed Feb 24 16:34:02 2010 +0100
> @@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes ?<ahughes@
> +2010-02-24 Pavel Tisnovsky ?<ptisnovs at redhat.com>
> + ? ? ? * Makefile.am: Corrected Pulse Audio
> + ? ? ? library build
> +
> ?2010-01-27 Andrew John Hughes ?<ahughes at redhat.com>
>
> ? ? ? ?* Makefile.am: Reference plugin
> diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
> --- a/Makefile.am ? ? ? Wed Jan 27 18:38:33 2010 +0000
> +++ b/Makefile.am ? ? ? Wed Feb 24 16:34:02 2010 +0100
> @@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
> ? ? ? ?$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
> ? ? ? ?$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
> ? ? ? ?$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
> + ? ? ? $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
> ? ? ? ?$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
> ?endif
> ? ? ? ?mkdir -p stamps
>

Can you explain this fix?  Also, it needs to be pushed to HEAD as well.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 ptisnovs at redhat.com  Wed Feb 24 09:04:33 2010
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Wed, 24 Feb 2010 18:04:33 +0100
Subject: /hg/release/icedtea6-1.7: Corrected PulseAudio library build
In-Reply-To: <17c6771e1002240757t3a3ff2b6o3d41d35e533cdc8a@mail.gmail.com>
References: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>
	<17c6771e1002240757t3a3ff2b6o3d41d35e533cdc8a@mail.gmail.com>
Message-ID: <4B855C21.5080902@redhat.com>

Andrew John Hughes wrote:
> On 24 February 2010 15:35,  <ptisnovs at icedtea.classpath.org> wrote:
>> changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
>> author: ptisnovs
>> date: Wed Feb 24 16:34:02 2010 +0100
>>
>>        Corrected PulseAudio library build
>>
>>
>> diffstat:
>>
>> 2 files changed, 5 insertions(+)
>> ChangeLog   |    4 ++++
>> Makefile.am |    1 +
>>
>> diffs (22 lines):
>>
>> diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
>> --- a/ChangeLog Wed Jan 27 18:38:33 2010 +0000
>> +++ b/ChangeLog Wed Feb 24 16:34:02 2010 +0100
>> @@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes  <ahughes@
>> +2010-02-24 Pavel Tisnovsky  <ptisnovs at redhat.com>
>> +       * Makefile.am: Corrected Pulse Audio
>> +       library build
>> +
>>  2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
>>
>>        * Makefile.am: Reference plugin
>> diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
>> --- a/Makefile.am       Wed Jan 27 18:38:33 2010 +0000
>> +++ b/Makefile.am       Wed Feb 24 16:34:02 2010 +0100
>> @@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
>>        $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
>>        $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
>>        $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
>> +       $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
>>        $(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
>>  endif
>>        mkdir -p stamps
>>
> 
> Can you explain this fix?  Also, it needs to be pushed to HEAD as well.

Functions from org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c 
are called from Java through JNI.

Yes I'll push similar change to head too, just after meeting :-)

Pavel



From gnu_andrew at member.fsf.org  Wed Feb 24 08:10:11 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 24 Feb 2010 16:10:11 +0000
Subject: /hg/release/icedtea6-1.7: Corrected PulseAudio library build
In-Reply-To: <4B855C21.5080902@redhat.com>
References: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>
	<17c6771e1002240757t3a3ff2b6o3d41d35e533cdc8a@mail.gmail.com>
	<4B855C21.5080902@redhat.com>
Message-ID: <17c6771e1002240810n47054b76hbf6945400ee5eb62@mail.gmail.com>

On 24 February 2010 17:04, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
> Andrew John Hughes wrote:
>>
>> On 24 February 2010 15:35, ?<ptisnovs at icedtea.classpath.org> wrote:
>>>
>>> changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
>>> details:
>>> http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
>>> author: ptisnovs
>>> date: Wed Feb 24 16:34:02 2010 +0100
>>>
>>> ? ? ? Corrected PulseAudio library build
>>>
>>>
>>> diffstat:
>>>
>>> 2 files changed, 5 insertions(+)
>>> ChangeLog ? | ? ?4 ++++
>>> Makefile.am | ? ?1 +
>>>
>>> diffs (22 lines):
>>>
>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
>>> --- a/ChangeLog Wed Jan 27 18:38:33 2010 +0000
>>> +++ b/ChangeLog Wed Feb 24 16:34:02 2010 +0100
>>> @@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes ?<ahughes@
>>> +2010-02-24 Pavel Tisnovsky ?<ptisnovs at redhat.com>
>>> + ? ? ? * Makefile.am: Corrected Pulse Audio
>>> + ? ? ? library build
>>> +
>>> ?2010-01-27 Andrew John Hughes ?<ahughes at redhat.com>
>>>
>>> ? ? ? * Makefile.am: Reference plugin
>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
>>> --- a/Makefile.am ? ? ? Wed Jan 27 18:38:33 2010 +0000
>>> +++ b/Makefile.am ? ? ? Wed Feb 24 16:34:02 2010 +0100
>>> @@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
>>> ? ? ? $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o
>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
>>> ? ? ? $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o
>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
>>> ? ? ? $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
>>> -o
>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
>>> + ? ? ? $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
>>> -o
>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
>>> ? ? ? $(CC) $(LDFLAGS) -shared
>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o
>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o
>>> libpulse-java.so
>>> ?endif
>>> ? ? ? mkdir -p stamps
>>>
>>
>> Can you explain this fix? ?Also, it needs to be pushed to HEAD as well.
>
> Functions from org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c are
> called from Java through JNI.
>
> Yes I'll push similar change to head too, just after meeting :-)
>

Ah ok.  On second thoughts, I'll fixed IcedTea6 HEAD.  It would be
better to rewrite this with a general rule rather than one per c file
so we don't hit this kind of issue.

> Pavel
>
>



-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 ptisnovs at redhat.com  Wed Feb 24 09:13:24 2010
From: ptisnovs at redhat.com (Pavel Tisnovsky)
Date: Wed, 24 Feb 2010 18:13:24 +0100
Subject: /hg/release/icedtea6-1.7: Corrected PulseAudio library build
In-Reply-To: <17c6771e1002240810n47054b76hbf6945400ee5eb62@mail.gmail.com>
References: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>	
	<17c6771e1002240757t3a3ff2b6o3d41d35e533cdc8a@mail.gmail.com>	
	<4B855C21.5080902@redhat.com>
	<17c6771e1002240810n47054b76hbf6945400ee5eb62@mail.gmail.com>
Message-ID: <4B855E34.4010100@redhat.com>

Andrew John Hughes wrote:
> On 24 February 2010 17:04, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
>> Andrew John Hughes wrote:
>>> On 24 February 2010 15:35,  <ptisnovs at icedtea.classpath.org> wrote:
>>>> changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
>>>> details:
>>>> http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
>>>> author: ptisnovs
>>>> date: Wed Feb 24 16:34:02 2010 +0100
>>>>
>>>>       Corrected PulseAudio library build
>>>>
>>>>
>>>> diffstat:
>>>>
>>>> 2 files changed, 5 insertions(+)
>>>> ChangeLog   |    4 ++++
>>>> Makefile.am |    1 +
>>>>
>>>> diffs (22 lines):
>>>>
>>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
>>>> --- a/ChangeLog Wed Jan 27 18:38:33 2010 +0000
>>>> +++ b/ChangeLog Wed Feb 24 16:34:02 2010 +0100
>>>> @@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes  <ahughes@
>>>> +2010-02-24 Pavel Tisnovsky  <ptisnovs at redhat.com>
>>>> +       * Makefile.am: Corrected Pulse Audio
>>>> +       library build
>>>> +
>>>>  2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
>>>>
>>>>       * Makefile.am: Reference plugin
>>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
>>>> --- a/Makefile.am       Wed Jan 27 18:38:33 2010 +0000
>>>> +++ b/Makefile.am       Wed Feb 24 16:34:02 2010 +0100
>>>> @@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
>>>>       $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o
>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
>>>>       $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o
>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
>>>>       $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
>>>> -o
>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
>>>> +       $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
>>>> -o
>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
>>>>       $(CC) $(LDFLAGS) -shared
>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o
>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o
>>>> libpulse-java.so
>>>>  endif
>>>>       mkdir -p stamps
>>>>
>>> Can you explain this fix?  Also, it needs to be pushed to HEAD as well.
>> Functions from org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c are
>> called from Java through JNI.
>>
>> Yes I'll push similar change to head too, just after meeting :-)
>>
> 
> Ah ok.  On second thoughts, I'll fixed IcedTea6 HEAD.  It would be
> better to rewrite this with a general rule rather than one per c file
> so we don't hit this kind of issue.

Great it's better solution. I pushed changes to 6-1.7 first because we 
need to release this version for F11 and F12, you know.



From gnu_andrew at member.fsf.org  Wed Feb 24 08:23:33 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 24 Feb 2010 16:23:33 +0000
Subject: /hg/release/icedtea6-1.7: Corrected PulseAudio library build
In-Reply-To: <4B855E34.4010100@redhat.com>
References: <hg.f4d6e5d2be10.1267025755.1785565629229908553@icedtea.classpath.org>
	<17c6771e1002240757t3a3ff2b6o3d41d35e533cdc8a@mail.gmail.com>
	<4B855C21.5080902@redhat.com>
	<17c6771e1002240810n47054b76hbf6945400ee5eb62@mail.gmail.com>
	<4B855E34.4010100@redhat.com>
Message-ID: <17c6771e1002240823i44b86d26y898a47b6ccd9974d@mail.gmail.com>

On 24 February 2010 17:13, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
> Andrew John Hughes wrote:
>>
>> On 24 February 2010 17:04, Pavel Tisnovsky <ptisnovs at redhat.com> wrote:
>>>
>>> Andrew John Hughes wrote:
>>>>
>>>> On 24 February 2010 15:35, ?<ptisnovs at icedtea.classpath.org> wrote:
>>>>>
>>>>> changeset f4d6e5d2be10 in /hg/release/icedtea6-1.7
>>>>> details:
>>>>>
>>>>> http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f4d6e5d2be10
>>>>> author: ptisnovs
>>>>> date: Wed Feb 24 16:34:02 2010 +0100
>>>>>
>>>>> ? ? ?Corrected PulseAudio library build
>>>>>
>>>>>
>>>>> diffstat:
>>>>>
>>>>> 2 files changed, 5 insertions(+)
>>>>> ChangeLog ? | ? ?4 ++++
>>>>> Makefile.am | ? ?1 +
>>>>>
>>>>> diffs (22 lines):
>>>>>
>>>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 ChangeLog
>>>>> --- a/ChangeLog Wed Jan 27 18:38:33 2010 +0000
>>>>> +++ b/ChangeLog Wed Feb 24 16:34:02 2010 +0100
>>>>> @@ -1,3 +1,7 @@ 2010-01-27 Andrew John Hughes ?<ahughes@
>>>>> +2010-02-24 Pavel Tisnovsky ?<ptisnovs at redhat.com>
>>>>> + ? ? ? * Makefile.am: Corrected Pulse Audio
>>>>> + ? ? ? library build
>>>>> +
>>>>> ?2010-01-27 Andrew John Hughes ?<ahughes at redhat.com>
>>>>>
>>>>> ? ? ?* Makefile.am: Reference plugin
>>>>> diff -r 1338c270a9c1 -r f4d6e5d2be10 Makefile.am
>>>>> --- a/Makefile.am ? ? ? Wed Jan 27 18:38:33 2010 +0000
>>>>> +++ b/Makefile.am ? ? ? Wed Feb 24 16:34:02 2010 +0100
>>>>> @@ -1615,6 +1615,7 @@ if ENABLE_PULSE_JAVA
>>>>> ? ? ?$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
>>>>> ? ? ?$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c
>>>>> -o
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
>>>>> ? ? ?$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c
>>>>> -o
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
>>>>> + ? ? ? $(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c
>>>>> -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include
>>>>> -I$(PULSE_JAVA_NATIVE_BUILDDIR)
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
>>>>> -o
>>>>>
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.o
>>>>> ? ? ?$(CC) $(LDFLAGS) -shared
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o
>>>>> $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o
>>>>> libpulse-java.so
>>>>> ?endif
>>>>> ? ? ?mkdir -p stamps
>>>>>
>>>> Can you explain this fix? ?Also, it needs to be pushed to HEAD as well.
>>>
>>> Functions from org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.c
>>> are
>>> called from Java through JNI.
>>>
>>> Yes I'll push similar change to head too, just after meeting :-)
>>>
>>
>> Ah ok. ?On second thoughts, I'll fixed IcedTea6 HEAD. ?It would be
>> better to rewrite this with a general rule rather than one per c file
>> so we don't hit this kind of issue.
>
> Great it's better solution. I pushed changes to 6-1.7 first because we need
> to release this version for F11 and F12, you know.
>
>

Yeah, understood.  I should backport the Rhino fix to 1.7 too.
Deepak, how close is NPPlugin to being ready for final release?
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 andrew at icedtea.classpath.org  Wed Feb 24 09:46:06 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 17:46:06 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.be32f963a8b7.1267033566.2873452341184383832@icedtea.classpath.org>

changeset be32f963a8b7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=be32f963a8b7
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 17:44:36 2010 +0000

	Provide a single rule to build all PulseAudio object files without
	explicit source file names.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Pul
	seAudioStreamVolumeControl.c: Removed, never built and no
	corresponding Java source file.
		* Makefile.am: (PULSE_JAVA_NATIVE_SRCS): List of PulseAudio
	source files. (PULSE_JAVA_NATIVE_OBJECTS): List of
	PulseAudio object files. (PULSE_JAVA_TARGET):
	Optional PulseAudio target. (icedtea.stamp): Replace
	explicit pulse-java.stamp with PULSE_JAVA_TARGET.
	(icedtea-debug.stamp): Likewise. (pulse-java.stamp): Depend
	on compiled library rather than headers target.
	($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): New target to compile
	object files from source files using make substitution.
	($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): New target
	to build the shared library. (pulse-java-jar.stamp): Make
	ENABLE_PULSE_JAVA conditional encompass all PulseAudio
	targets. (pulse-java-class.stamp): Likewise. (clean-
	pulse-java): Likewise. (pulse-java-headers.stamp): Likewise,
	and remove unneeded BOOT_DIR conditional (pulse-java-
	class.stamp now depends on the appropriate bootstrap
	target).


changeset 25ad23f47dfd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=25ad23f47dfd
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 17:45:42 2010 +0000

	Merge


diffstat:

48 files changed, 1021 insertions(+), 1613 deletions(-)
ChangeLog                                                                              |  138 ++++++
Makefile.am                                                                            |   70 +--
plugin/icedteanp/IcedTeaNPPlugin.cc                                                    |    4 
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java                               |   10 
ports/hotspot/make/linux/makefiles/shark.make                                          |    6 
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp                                   |   12 
ports/hotspot/src/share/vm/includeDB_shark                                             |    2 
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp                                       |    1 
ports/hotspot/src/share/vm/shark/sharkBlock.cpp                                        |  157 ++-----
ports/hotspot/src/share/vm/shark/sharkBlock.hpp                                        |   85 +--
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp                                      |  193 ++------
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp                                      |   14 
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp                                 |   67 +--
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp                                 |  129 +----
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp                                   |   18 
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp                                     |   70 ++-
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp                                     |   15 
ports/hotspot/src/share/vm/shark/sharkConstant.cpp                                     |    9 
ports/hotspot/src/share/vm/shark/sharkConstant.hpp                                     |   12 
ports/hotspot/src/share/vm/shark/sharkContext.cpp                                      |   17 
ports/hotspot/src/share/vm/shark/sharkContext.hpp                                      |   89 +---
ports/hotspot/src/share/vm/shark/sharkEntry.hpp                                        |   21 
ports/hotspot/src/share/vm/shark/sharkFunction.cpp                                     |   46 --
ports/hotspot/src/share/vm/shark/sharkFunction.hpp                                     |   37 -
ports/hotspot/src/share/vm/shark/sharkInliner.cpp                                      |  107 +---
ports/hotspot/src/share/vm/shark/sharkInliner.hpp                                      |    2 
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp                                   |   34 -
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp                                   |    3 
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp                                   |    3 
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp                                   |   50 --
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp                                |   51 --
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp                                |   12 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp                                |   17 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp                                |   68 +--
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp                                      |   52 --
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp                                      |   19 
ports/hotspot/src/share/vm/shark/sharkStack.cpp                                        |   65 +-
ports/hotspot/src/share/vm/shark/sharkStack.hpp                                        |   92 +---
ports/hotspot/src/share/vm/shark/sharkState.cpp                                        |   42 -
ports/hotspot/src/share/vm/shark/sharkState.hpp                                        |   65 --
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp                                 |   13 
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp                                 |    5 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp                                |  222 +++-------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp                                |  115 +----
ports/hotspot/src/share/vm/shark/sharkType.hpp                                         |   75 +--
ports/hotspot/src/share/vm/shark/sharkValue.cpp                                        |  168 ++-----
ports/hotspot/src/share/vm/shark/sharkValue.hpp                                        |   65 +-
pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c |   67 ---

diffs (truncated from 6623 to 500 lines):

diff -r ede5e9311ef4 -r 25ad23f47dfd ChangeLog
--- a/ChangeLog	Sun Feb 21 12:38:45 2010 +0000
+++ b/ChangeLog	Wed Feb 24 17:45:42 2010 +0000
@@ -1,3 +1,141 @@ 2010-02-21 Andrew John Hughes  <ahughes@
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c:
+	Removed, never built and no corresponding
+	Java source file.
+	* Makefile.am:
+	(PULSE_JAVA_NATIVE_SRCS): List of PulseAudio source
+	files.
+	(PULSE_JAVA_NATIVE_OBJECTS): List of PulseAudio object
+	files.
+	(PULSE_JAVA_TARGET): Optional PulseAudio target.
+	(icedtea.stamp): Replace explicit pulse-java.stamp
+	with PULSE_JAVA_TARGET.
+	(icedtea-debug.stamp): Likewise.
+	(pulse-java.stamp): Depend on compiled library rather than
+	headers target.
+	($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): New target to compile
+	object files from source files using make substitution.
+	($(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so): New target
+	to build the shared library.
+	(pulse-java-jar.stamp): Make ENABLE_PULSE_JAVA conditional
+	encompass all PulseAudio targets.
+	(pulse-java-class.stamp): Likewise.
+	(clean-pulse-java): Likewise.
+	(pulse-java-headers.stamp): Likewise, and remove unneeded
+	BOOT_DIR conditional (pulse-java-class.stamp now depends on
+	the appropriate bootstrap target).
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
+	with trailing opening braces to match upstream HotSpot.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23  Deepak Bhole <dbhole at redhat.com>
+
+	* Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
+	jpi version.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
+2010-02-22  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
+	and increased timeouts to give slow-loading applets enough time to load.
+
+2010-02-21  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(MCPU): Explicitly defined for use by LLVM command line parser.
+	(MAttrs): Likewise.
+	(SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
+	in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
+	JIT are linked in.
+
 2010-02-21 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r ede5e9311ef4 -r 25ad23f47dfd Makefile.am
--- a/Makefile.am	Sun Feb 21 12:38:45 2010 +0000
+++ b/Makefile.am	Wed Feb 24 17:45:42 2010 +0000
@@ -167,17 +167,14 @@ 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_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
 PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio
 PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
+PULSE_JAVA_NATIVE_OBJECTS = \
+	$(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
 PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
 PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
-else 
-PULSE_JAVA_DIR =
-PULSE_JAVA_NATIVE_SRCDIR =
-PULSE_JAVA_BUILDDIR =
-PULSE_JAVA_NATIVE_BUILDDIR =
-PULSE_JAVA_JAVA_SRCDIR =
-PULSE_JAVA_CLASS_DIR =
+PULSE_JAVA_TARGET = stamps/pulse-java.stamp
 endif
 
 # FIXME (HotSpot): no longer needed
@@ -1320,7 +1317,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
 	extra-lib/about.jar stamps/cacao.stamp \
-	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+	stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1421,7 +1418,7 @@ stamps/icedtea-debug.stamp: stamps/boots
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/plugs.stamp $(OPENJDK_TREE) stamps/plugin.stamp \
 	extra-lib/about.jar stamps/cacao.stamp \
-	stamps/visualvm.stamp stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
+	stamps/visualvm.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1608,6 +1605,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 	mkdir -p $(NPPLUGIN_DIR) && \
 	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
+	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  $(GLIB_CFLAGS) \
@@ -1705,21 +1703,21 @@ extra-lib/about.jar: stamps/extra-class-
 
 #FIXME (meta): Need pulse-java meta target
 
-stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp stamps/pulse-java-headers.stamp
 if ENABLE_PULSE_JAVA
+$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
 	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
-	$(CC) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include $(PULSE_JAVA_NATIVE_SRCDIR)/jni-common.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o
-	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_EventLoop.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_EventLoop.o
-	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Operation.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Operation.o
-	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_Stream.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_Stream.o
-	$(CC) $(LIBPULSE_CFLAGS) $(CFLAGS) -fPIC -c -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include -I$(PULSE_JAVA_NATIVE_BUILDDIR) $(PULSE_JAVA_NATIVE_SRCDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.c -o $(PULSE_JAVA_NATIVE_BUILDDIR)/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.o
-	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_BUILDDIR)/org_*pulseaudio*.o $(PULSE_JAVA_NATIVE_BUILDDIR)/jni-common.o $(LIBPULSE_LIBS) -o libpulse-java.so
-endif
+	$(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
+	 -o $@ -c $<
+
+$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
+	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
+	 -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
+
+stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
 	mkdir -p stamps
 	touch stamps/pulse-java.stamp
 
 stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
-if ENABLE_PULSE_JAVA
 	mkdir -p $(PULSE_JAVA_CLASS_DIR);
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
@@ -1727,48 +1725,36 @@ if ENABLE_PULSE_JAVA
 	else \
 	  $(ICEDTEA_BOOT_DIR)/bin/jar cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .; \
 	fi
-endif
 	mkdir -p stamps
 	touch stamps/pulse-java-jar.stamp
 
 stamps/pulse-java-class.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
-if ENABLE_PULSE_JAVA
 	mkdir -p $(PULSE_JAVA_CLASS_DIR)
 	(cd $(PULSE_JAVA_JAVA_SRCDIR); \
-	 $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR)\
+	 $(ICEDTEA_BOOT_DIR)/bin/javac -g -d $(PULSE_JAVA_CLASS_DIR) \
 	  -bootclasspath '$(ICEDTEA_BOOT_DIR)/jre/lib/rt.jar' \
-	  org/classpath/icedtea/pulseaudio/*.java\
+	  org/classpath/icedtea/pulseaudio/*.java \
 	)
 	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
 
-
 stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
-if ENABLE_PULSE_JAVA
-	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
-	then \
-	  $(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_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
+	$(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 ; \
 	mkdir -p stamps
 	touch stamps/pulse-java-headers.stamp
 
-
 clean-pulse-java:
-if ENABLE_PULSE_JAVA
 	[ -z "$(PULSE_JAVA_NATIVE_BUILDDIR)" ] || rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR)
 	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
 	rm -f stamps/pulse-java*.stamp
diff -r ede5e9311ef4 -r 25ad23f47dfd plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Sun Feb 21 12:38:45 2010 +0000
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Feb 24 17:45:42 2010 +0000
@@ -107,7 +107,7 @@ exception statement from your version. *
   "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-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":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;"           \
@@ -123,7 +123,7 @@ exception statement from your version. *
   "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;"    \
+  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 
 #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
diff -r ede5e9311ef4 -r 25ad23f47dfd plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Sun Feb 21 12:38:45 2010 +0000
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Feb 24 17:45:42 2010 +0000
@@ -177,7 +177,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
          Applet a;
          
          // Wait for panel to come alive
-         int maxWait = 5000; // wait 5 seconds max for panel to come alive
+         int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
          int wait = 0;
          while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
               try {
@@ -368,6 +368,8 @@ import com.sun.jndi.toolkit.url.UrlUtil;
      private long handle = 0;
      private WindowListener windowEventListener = null;
      private AppletEventListener appletEventListener = null;
+     
+     public static final int APPLET_TIMEOUT = 60000;
 
      /**
       * Null constructor to allow instantiation via newInstance()
@@ -616,7 +618,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
                  if (message.startsWith("handle")) {
 
                      PluginDebug.debug("handle command waiting for applet to complete loading.");
-                     int maxWait = 10000; // wait 10 seconds max for applet to fully load
+                     int maxWait = APPLET_TIMEOUT; // wait for applet to fully load
                      int wait = 0;
                      while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) &&
                              (wait < maxWait)) {
@@ -663,7 +665,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
          if (message.startsWith("width")) {
 
              // Wait for panel to come alive
-             int maxWait = 5000; // wait 5 seconds max for panel to come alive
+             int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
              int wait = 0;
              while (!status.get(identifier).equals(PAV_INIT_STATUS.INIT_COMPLETE) && wait < maxWait) {
                   try {
@@ -724,7 +726,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
              Object o;
 
              // Wait for panel to come alive
-             int maxWait = 5000; // wait 5 seconds max for panel to come alive
+             int maxWait = APPLET_TIMEOUT; // wait for panel to come alive
              int wait = 0;
              while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
                   try {
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Wed Feb 24 17:45:42 2010 +0000
@@ -1,6 +1,6 @@
 #
 # Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -20,10 +20,10 @@
 # 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.
-#  
+#
 #
 
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
 
 TYPE = SHARK
 
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Wed Feb 24 17:45:42 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,11 @@
  * 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.
- *  
+ *
  */
 
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler.  See globals.hpp for details of what they do.
 
 define_pd_global(bool,  BackgroundCompilation,        true );
 define_pd_global(bool,  UseTLAB,                      true );
@@ -52,7 +50,7 @@ define_pd_global(intx,  NewRatio,       
 define_pd_global(intx,  NewRatio,                     12   );
 define_pd_global(intx,  NewSizeThreadIncrease,        4*K  );
 define_pd_global(intx,  InitialCodeCacheSize,         160*K);
-define_pd_global(intx,  ReservedCodeCacheSize,        32*M ); 
+define_pd_global(intx,  ReservedCodeCacheSize,        32*M );
 define_pd_global(bool,  ProfileInterpreter,           false);
 define_pd_global(intx,  CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,      1    );
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Wed Feb 24 17:45:42 2010 +0000
@@ -20,7 +20,7 @@
 // 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.
-//  
+//
 //
 
 // NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Wed Feb 24 17:45:42 2010 +0000
@@ -44,6 +44,7 @@
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
 #include <llvm/Support/CommandLine.h>
 #if SHARK_LLVM_VERSION >= 27
+#include <llvm/ExecutionEngine/JIT.h>
 #include <llvm/ADT/StringMap.h>
 #include <llvm/Support/Debug.h>
 #include <llvm/System/Host.h>
diff -r ede5e9311ef4 -r 25ad23f47dfd ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Sun Feb 21 12:38:45 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Wed Feb 24 17:45:42 2010 +0000
@@ -28,8 +28,7 @@
 
 using namespace llvm;
 
-void SharkBlock::parse_bytecode(int start, int limit)
-{
+void SharkBlock::parse_bytecode(int start, int limit) {
   SharkValue *a, *b, *c, *d;
   int i;
 
@@ -45,7 +44,7 @@ void SharkBlock::parse_bytecode(int star
 
     if (SharkTraceBytecodes)
       tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc()));
-    
+
     if (has_trap() && trap_bci() == bci()) {
       do_trap(trap_request());
       return;
@@ -96,7 +95,7 @@ void SharkBlock::parse_bytecode(int star
           }
         }
         break;
-      }  
+      }
     }
 
     switch (bc()) {
@@ -295,25 +294,25 @@ void SharkBlock::parse_bytecode(int star
       xpop();
       xpop();
       break;
-    case Bytecodes::_swap: 
+    case Bytecodes::_swap:
       a = xpop();
       b = xpop();
       xpush(a);
       xpush(b);
-      break;  
+      break;
     case Bytecodes::_dup:
       a = xpop();
       xpush(a);
       xpush(a);
       break;
-    case Bytecodes::_dup_x1: 
+    case Bytecodes::_dup_x1:
       a = xpop();
       b = xpop();
       xpush(a);
       xpush(b);
       xpush(a);
       break;
-    case Bytecodes::_dup_x2: 
+    case Bytecodes::_dup_x2:
       a = xpop();


From andrew at icedtea.classpath.org  Wed Feb 24 10:52:55 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 18:52:55 +0000
Subject: /hg/icedtea6: Refer to libpulse-java.so with full path to native...
Message-ID: <hg.cba544e79a99.1267037575.2873452341184383832@icedtea.classpath.org>

changeset cba544e79a99 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cba544e79a99
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 18:52:44 2010 +0000

	Refer to libpulse-java.so with full path to native build directory.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (icedtea.stamp): Prefix libpulse-
	java.so with build directory path. (icedtea-
	debug.stamp): Likewise. (clean-pulse-java): No need to
	delete libpulse-java.so as no longer at top-level.


diffstat:

2 files changed, 13 insertions(+), 5 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |    9 ++++-----

diffs (51 lines):

diff -r 25ad23f47dfd -r cba544e79a99 ChangeLog
--- a/ChangeLog	Wed Feb 24 17:45:42 2010 +0000
+++ b/ChangeLog	Wed Feb 24 18:52:44 2010 +0000
@@ -1,3 +1,12 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(icedtea.stamp): Prefix libpulse-java.so with
+	build directory path.
+	(icedtea-debug.stamp): Likewise.
+	(clean-pulse-java): No need to delete libpulse-java.so
+	as no longer at top-level.
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c:
diff -r 25ad23f47dfd -r cba544e79a99 Makefile.am
--- a/Makefile.am	Wed Feb 24 17:45:42 2010 +0000
+++ b/Makefile.am	Wed Feb 24 18:52:44 2010 +0000
@@ -1340,9 +1340,9 @@ endif
 endif
 endif
 if ENABLE_PULSE_JAVA
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	cp -pPRf pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
@@ -1441,9 +1441,9 @@ endif
 endif
 endif
 if ENABLE_PULSE_JAVA
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	cp -pPRf pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
@@ -1759,7 +1759,6 @@ clean-pulse-java:
 	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
 	rm -f stamps/pulse-java*.stamp
 	rm -f pulse-java.jar
-	rm -f libpulse-java.so
 endif
 
 # end of pulse-java


From andrew at icedtea.classpath.org  Wed Feb 24 12:22:30 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 20:22:30 +0000
Subject: /hg/icedtea6: Make sure PulseAudio headers are picked up by addi...
Message-ID: <hg.04345d27c594.1267042950.2873452341184383832@icedtea.classpath.org>

changeset 04345d27c594 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=04345d27c594
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 20:22:15 2010 +0000

	Make sure PulseAudio headers are picked up by adding
	-I$(PULSE_JAVA_NATIVE_BUILDDIR)

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add missing pulse-java alias and
	reorganise existing aliases alphabetically.
	($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Add include directive
	for build directory to pick up generated headers.


diffstat:

2 files changed, 28 insertions(+), 17 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |   36 +++++++++++++++++++-----------------

diffs (96 lines):

diff -r cba544e79a99 -r 04345d27c594 ChangeLog
--- a/ChangeLog	Wed Feb 24 18:52:44 2010 +0000
+++ b/ChangeLog	Wed Feb 24 20:22:15 2010 +0000
@@ -1,3 +1,12 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add missing pulse-java alias and reorganise
+	existing aliases alphabetically.
+	($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Add include
+	directive for build directory to pick up generated
+	headers.
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r cba544e79a99 -r 04345d27c594 Makefile.am
--- a/Makefile.am	Wed Feb 24 18:52:44 2010 +0000
+++ b/Makefile.am	Wed Feb 24 20:22:15 2010 +0000
@@ -1707,7 +1707,7 @@ if ENABLE_PULSE_JAVA
 $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
 	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
 	$(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
-	 -o $@ -c $<
+	 -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
 
 $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
 	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
@@ -2199,7 +2199,7 @@ bootstrap-directory-symlink: stamps/boot
 
 cacao: stamps/cacao.stamp
 
-visualvm: stamps/visualvm.stamp
+clean: distclean-local
 
 nbplatform: stamps/nbplatform.stamp
 
@@ -2217,6 +2217,8 @@ extract: stamps/extract.stamp
 
 extract-ecj: stamps/extract-ecj.stamp
 
+hotspot-ports: stamps/ports.stamp
+
 icedtea: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
 
 icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
@@ -2225,34 +2227,34 @@ icedtea-debug: stamps/icedtea-debug.stam
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 
+jtreg: stamps/jtreg.stamp
+
 native-ecj: stamps/native-ecj.stamp
+
+overlay: stamps/overlay.stamp
+
+patch: stamps/patch.stamp
 
 patch-ecj: stamps/patch-ecj.stamp
 
-patch: stamps/patch.stamp
-
 patch-fsg: stamps/patch-fsg.stamp
 
-overlay: stamps/overlay.stamp
+plugin: stamps/plugin.stamp
+
+plugin-tests: stamps/plugin-tests.stamp
+
+plugs: stamps/plugs.stamp
+
+pulse-java: stamps/pulse-java.stamp
 
 rewriter: stamps/rewriter.stamp
 
 rewrite-rhino: stamps/rewrite-rhino.stamp
 
-plugs: stamps/plugs.stamp
+replace-hotspot: stamps/replace-hotspot.stamp
 
 rt-jar: stamps/rt.stamp
 
 rt-class-files: stamps/rt-class-files.stamp
 
-replace-hotspot: stamps/replace-hotspot.stamp
-
-hotspot-ports: stamps/ports.stamp
-
-clean: distclean-local
-
-jtreg: stamps/jtreg.stamp
-
-plugin: stamps/plugin.stamp
-
-plugin-tests: stamps/plugin-tests.stamp
+visualvm: stamps/visualvm.stamp


From andrew at icedtea.classpath.org  Wed Feb 24 13:09:05 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 21:09:05 +0000
Subject: /hg/icedtea6: 2 new changesets
Message-ID: <hg.abe692ba050f.1267045745.2873452341184383832@icedtea.classpath.org>

changeset abe692ba050f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=abe692ba050f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 20:56:59 2010 +0000

	Use full path to jar application when rewriting Rhino files.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (rewrite-rhino.stamp): Use full path
	to jar application to avoid relying on the one on
	the path.


changeset e0792821e2e7 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e0792821e2e7
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 21:07:59 2010 +0000

	Cleanup .hgignore, including turning off bad usage of regular
	expressions.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * .hgignore: Severely trim the list especially the
	use of regular expressions which are matching unwanted
	files.


diffstat:

3 files changed, 16 insertions(+), 424 deletions(-)
.hgignore   |  422 -----------------------------------------------------------
ChangeLog   |   13 +
Makefile.am |    5 

diffs (487 lines):

diff -r 04345d27c594 -r e0792821e2e7 .hgignore
--- a/.hgignore	Wed Feb 24 20:22:15 2010 +0000
+++ b/.hgignore	Wed Feb 24 21:07:59 2010 +0000
@@ -1,7 +1,5 @@ syntax: glob
 syntax: glob
 *~
-
-syntax: regexp
 configure
 missing
 aclocal.m4
@@ -41,426 +39,6 @@ test/jtreg/classes
 test/jtreg/classes
 test/jtreg-summary.log
 test/check-.*log
-rt/com/sun/jdi/AbsentInformationException.java
-rt/com/sun/jdi/Accessible.java
-rt/com/sun/jdi/ArrayReference.java
-rt/com/sun/jdi/ArrayType.java
-rt/com/sun/jdi/BooleanType.java
-rt/com/sun/jdi/BooleanValue.java
-rt/com/sun/jdi/Bootstrap.java
-rt/com/sun/jdi/ByteType.java
-rt/com/sun/jdi/ByteValue.java
-rt/com/sun/jdi/CharType.java
-rt/com/sun/jdi/CharValue.java
-rt/com/sun/jdi/ClassLoaderReference.java
-rt/com/sun/jdi/ClassNotLoadedException.java
-rt/com/sun/jdi/ClassNotPreparedException.java
-rt/com/sun/jdi/ClassObjectReference.java
-rt/com/sun/jdi/ClassType.java
-rt/com/sun/jdi/connect/AttachingConnector.java
-rt/com/sun/jdi/connect/Connector.java
-rt/com/sun/jdi/connect/IllegalConnectorArgumentsException.java
-rt/com/sun/jdi/connect/LaunchingConnector.java
-rt/com/sun/jdi/connect/ListeningConnector.java
-rt/com/sun/jdi/connect/spi/ClosedConnectionException.java
-rt/com/sun/jdi/connect/spi/Connection.java
-rt/com/sun/jdi/connect/spi/TransportService.java
-rt/com/sun/jdi/connect/Transport.java
-rt/com/sun/jdi/connect/TransportTimeoutException.java
-rt/com/sun/jdi/connect/VMStartException.java
-rt/com/sun/jdi/DoubleType.java
-rt/com/sun/jdi/DoubleValue.java
-rt/com/sun/jdi/event/AccessWatchpointEvent.java
-rt/com/sun/jdi/event/BreakpointEvent.java
-rt/com/sun/jdi/event/ClassPrepareEvent.java
-rt/com/sun/jdi/event/ClassUnloadEvent.java
-rt/com/sun/jdi/event/EventIterator.java
-rt/com/sun/jdi/event/Event.java
-rt/com/sun/jdi/event/EventQueue.java
-rt/com/sun/jdi/event/EventSet.java
-rt/com/sun/jdi/event/ExceptionEvent.java
-rt/com/sun/jdi/event/LocatableEvent.java
-rt/com/sun/jdi/event/MethodEntryEvent.java
-rt/com/sun/jdi/event/MethodExitEvent.java
-rt/com/sun/jdi/event/ModificationWatchpointEvent.java
-rt/com/sun/jdi/event/MonitorContendedEnteredEvent.java
-rt/com/sun/jdi/event/MonitorContendedEnterEvent.java
-rt/com/sun/jdi/event/MonitorWaitedEvent.java
-rt/com/sun/jdi/event/MonitorWaitEvent.java
-rt/com/sun/jdi/event/StepEvent.java
-rt/com/sun/jdi/event/ThreadDeathEvent.java
-rt/com/sun/jdi/event/ThreadStartEvent.java
-rt/com/sun/jdi/event/VMDeathEvent.java
-rt/com/sun/jdi/event/VMDisconnectEvent.java
-rt/com/sun/jdi/event/VMStartEvent.java
-rt/com/sun/jdi/event/WatchpointEvent.java
-rt/com/sun/jdi/Field.java
-rt/com/sun/jdi/FloatType.java
-rt/com/sun/jdi/FloatValue.java
-rt/com/sun/jdi/IncompatibleThreadStateException.java
-rt/com/sun/jdi/InconsistentDebugInfoException.java
-rt/com/sun/jdi/IntegerType.java
-rt/com/sun/jdi/IntegerValue.java
-rt/com/sun/jdi/InterfaceType.java
-rt/com/sun/jdi/InternalException.java
-rt/com/sun/jdi/InvalidCodeIndexException.java
-rt/com/sun/jdi/InvalidLineNumberException.java
-rt/com/sun/jdi/InvalidStackFrameException.java
-rt/com/sun/jdi/InvalidTypeException.java
-rt/com/sun/jdi/InvocationException.java
-rt/com/sun/jdi/JDIPermission.java
-rt/com/sun/jdi/LocalVariable.java
-rt/com/sun/jdi/Locatable.java
-rt/com/sun/jdi/Location.java
-rt/com/sun/jdi/LongType.java
-rt/com/sun/jdi/LongValue.java
-rt/com/sun/jdi/Method.java
-rt/com/sun/jdi/Mirror.java
-rt/com/sun/jdi/MonitorInfo.java
-rt/com/sun/jdi/NativeMethodException.java
-rt/com/sun/jdi/ObjectCollectedException.java
-rt/com/sun/jdi/ObjectReference.java
-rt/com/sun/jdi/PathSearchingVirtualMachine.java
-rt/com/sun/jdi/PrimitiveType.java
-rt/com/sun/jdi/PrimitiveValue.java
-rt/com/sun/jdi/ReferenceType.java
-rt/com/sun/jdi/request/AccessWatchpointRequest.java
-rt/com/sun/jdi/request/BreakpointRequest.java
-rt/com/sun/jdi/request/ClassPrepareRequest.java
-rt/com/sun/jdi/request/ClassUnloadRequest.java
-rt/com/sun/jdi/request/DuplicateRequestException.java
-rt/com/sun/jdi/request/EventRequest.java
-rt/com/sun/jdi/request/EventRequestManager.java
-rt/com/sun/jdi/request/ExceptionRequest.java
-rt/com/sun/jdi/request/InvalidRequestStateException.java
-rt/com/sun/jdi/request/MethodEntryRequest.java
-rt/com/sun/jdi/request/MethodExitRequest.java
-rt/com/sun/jdi/request/ModificationWatchpointRequest.java
-rt/com/sun/jdi/request/MonitorContendedEnteredRequest.java
-rt/com/sun/jdi/request/MonitorContendedEnterRequest.java
-rt/com/sun/jdi/request/MonitorWaitedRequest.java
-rt/com/sun/jdi/request/MonitorWaitRequest.java
-rt/com/sun/jdi/request/StepRequest.java
-rt/com/sun/jdi/request/ThreadDeathRequest.java
-rt/com/sun/jdi/request/ThreadStartRequest.java
-rt/com/sun/jdi/request/VMDeathRequest.java
-rt/com/sun/jdi/request/WatchpointRequest.java
-rt/com/sun/jdi/ShortType.java
-rt/com/sun/jdi/ShortValue.java
-rt/com/sun/jdi/StackFrame.java
-rt/com/sun/jdi/StringReference.java
-rt/com/sun/jdi/ThreadGroupReference.java
-rt/com/sun/jdi/ThreadReference.java
-rt/com/sun/jdi/TypeComponent.java
-rt/com/sun/jdi/Type.java
-rt/com/sun/jdi/Value.java
-rt/com/sun/jdi/VirtualMachine.java
-rt/com/sun/jdi/VirtualMachineManager.java
-rt/com/sun/jdi/VMCannotBeModifiedException.java
-rt/com/sun/jdi/VMDisconnectedException.java
-rt/com/sun/jdi/VMMismatchException.java
-rt/com/sun/jdi/VMOutOfMemoryException.java
-rt/com/sun/jdi/VoidType.java
-rt/com/sun/jdi/VoidValue.java
-rt/com/sun/jmx/snmp/agent/SnmpEntryOid.java
-rt/com/sun/jmx/snmp/agent/SnmpErrorHandlerAgent.java
-rt/com/sun/jmx/snmp/agent/SnmpGenericMetaServer.java
-rt/com/sun/jmx/snmp/agent/SnmpGenericObjectServer.java
-rt/com/sun/jmx/snmp/agent/SnmpIndex.java
-rt/com/sun/jmx/snmp/agent/SnmpMibAgent.java
-rt/com/sun/jmx/snmp/agent/SnmpMibAgentMBean.java
-rt/com/sun/jmx/snmp/agent/SnmpMibEntry.java
-rt/com/sun/jmx/snmp/agent/SnmpMibGroup.java
-rt/com/sun/jmx/snmp/agent/SnmpMibHandler.java
-rt/com/sun/jmx/snmp/agent/SnmpMib.java
-rt/com/sun/jmx/snmp/agent/SnmpMibNode.java
-rt/com/sun/jmx/snmp/agent/SnmpMibOid.java
-rt/com/sun/jmx/snmp/agent/SnmpMibRequestImpl.java
-rt/com/sun/jmx/snmp/agent/SnmpMibRequest.java
-rt/com/sun/jmx/snmp/agent/SnmpMibSubRequest.java
-rt/com/sun/jmx/snmp/agent/SnmpMibTable.java
-rt/com/sun/jmx/snmp/agent/SnmpRequestTree.java
-rt/com/sun/jmx/snmp/agent/SnmpStandardMetaServer.java
-rt/com/sun/jmx/snmp/agent/SnmpStandardObjectServer.java
-rt/com/sun/jmx/snmp/agent/SnmpTableCallbackHandler.java
-rt/com/sun/jmx/snmp/agent/SnmpTableEntryFactory.java
-rt/com/sun/jmx/snmp/agent/SnmpTableEntryNotification.java
-rt/com/sun/jmx/snmp/agent/SnmpTableSupport.java
-rt/com/sun/jmx/snmp/agent/SnmpUserDataFactory.java
-rt/com/sun/jmx/snmp/daemon/SnmpInformRequest.java
-rt/com/sun/jmx/snmp/daemon/SnmpSession.java
-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/tools/jdi/AbstractLauncher.java
-rt/com/sun/tools/jdi/ArrayReferenceImpl.java
-rt/com/sun/tools/jdi/ArrayTypeImpl.java
-rt/com/sun/tools/jdi/BaseLineInfo.java
-rt/com/sun/tools/jdi/BooleanTypeImpl.java
-rt/com/sun/tools/jdi/BooleanValueImpl.java
-rt/com/sun/tools/jdi/ByteTypeImpl.java
-rt/com/sun/tools/jdi/ByteValueImpl.java
-rt/com/sun/tools/jdi/CharTypeImpl.java
-rt/com/sun/tools/jdi/CharValueImpl.java
-rt/com/sun/tools/jdi/ClassLoaderReferenceImpl.java
-rt/com/sun/tools/jdi/ClassObjectReferenceImpl.java
-rt/com/sun/tools/jdi/ClassTypeImpl.java
-rt/com/sun/tools/jdi/CommandSender.java
-rt/com/sun/tools/jdi/ConcreteMethodImpl.java
-rt/com/sun/tools/jdi/ConnectorImpl.java
-rt/com/sun/tools/jdi/DoubleTypeImpl.java
-rt/com/sun/tools/jdi/DoubleValueImpl.java
-rt/com/sun/tools/jdi/EventQueueImpl.java
-rt/com/sun/tools/jdi/EventRequestManagerImpl.java
-rt/com/sun/tools/jdi/EventSetImpl.java
-rt/com/sun/tools/jdi/FieldImpl.java
-rt/com/sun/tools/jdi/FloatTypeImpl.java
-rt/com/sun/tools/jdi/FloatValueImpl.java
-rt/com/sun/tools/jdi/GenericAttachingConnector.java
-rt/com/sun/tools/jdi/GenericListeningConnector.java
-rt/com/sun/tools/jdi/IntegerTypeImpl.java
-rt/com/sun/tools/jdi/IntegerValueImpl.java
-rt/com/sun/tools/jdi/InterfaceTypeImpl.java
-rt/com/sun/tools/jdi/InternalEventHandler.java
-rt/com/sun/tools/jdi/JDWPException.java
-rt/com/sun/tools/jdi/JNITypeParser.java
-rt/com/sun/tools/jdi/LineInfo.java
-rt/com/sun/tools/jdi/LinkedHashMap.java
-rt/com/sun/tools/jdi/LocalVariableImpl.java
-rt/com/sun/tools/jdi/LocationImpl.java
-rt/com/sun/tools/jdi/LockObject.java
-rt/com/sun/tools/jdi/LongTypeImpl.java
-rt/com/sun/tools/jdi/LongValueImpl.java
-rt/com/sun/tools/jdi/MethodImpl.java
-rt/com/sun/tools/jdi/MirrorImpl.java
-rt/com/sun/tools/jdi/MonitorInfoImpl.java
-rt/com/sun/tools/jdi/NonConcreteMethodImpl.java
-rt/com/sun/tools/jdi/ObjectReferenceImpl.java
-rt/com/sun/tools/jdi/ObsoleteMethodImpl.java
-rt/com/sun/tools/jdi/Packet.java
-rt/com/sun/tools/jdi/PacketStream.java
-rt/com/sun/tools/jdi/PrimitiveTypeImpl.java
-rt/com/sun/tools/jdi/PrimitiveValueImpl.java
-rt/com/sun/tools/jdi/ProcessAttachingConnector.java
-rt/com/sun/tools/jdi/RawCommandLineLauncher.java
-rt/com/sun/tools/jdi/ReferenceTypeImpl.java
-rt/com/sun/tools/jdi/SDE.java
-rt/com/sun/tools/jdi/ShortTypeImpl.java
-rt/com/sun/tools/jdi/ShortValueImpl.java
-rt/com/sun/tools/jdi/SocketAttachingConnector.java
-rt/com/sun/tools/jdi/SocketListeningConnector.java
-rt/com/sun/tools/jdi/SocketTransportService.java
-rt/com/sun/tools/jdi/StackFrameImpl.java
-rt/com/sun/tools/jdi/StratumLineInfo.java
-rt/com/sun/tools/jdi/StringReferenceImpl.java
-rt/com/sun/tools/jdi/SunCommandLineLauncher.java
-rt/com/sun/tools/jdi/TargetVM.java
-rt/com/sun/tools/jdi/ThreadAction.java
-rt/com/sun/tools/jdi/ThreadGroupReferenceImpl.java
-rt/com/sun/tools/jdi/ThreadListener.java
-rt/com/sun/tools/jdi/ThreadReferenceImpl.java
-rt/com/sun/tools/jdi/TypeComponentImpl.java
-rt/com/sun/tools/jdi/TypeImpl.java
-rt/com/sun/tools/jdi/ValueContainer.java
-rt/com/sun/tools/jdi/ValueImpl.java
-rt/com/sun/tools/jdi/VirtualMachineImpl.java
-rt/com/sun/tools/jdi/VirtualMachineManagerImpl.java
-rt/com/sun/tools/jdi/VirtualMachineManagerService.java
-rt/com/sun/tools/jdi/VMAction.java
-rt/com/sun/tools/jdi/VMListener.java
-rt/com/sun/tools/jdi/VMModifiers.java
-rt/com/sun/tools/jdi/VMState.java
-rt/com/sun/tools/jdi/VoidTypeImpl.java
-rt/com/sun/tools/jdi/VoidValueImpl.java
-rt/java/util/AbstractCollection.java
-rt/java/util/AbstractList.java
-rt/java/util/AbstractMap.java
-rt/java/util/AbstractQueue.java
-rt/java/util/AbstractSequentialList.java
-rt/java/util/AbstractSet.java
-rt/java/util/ArrayDeque.java
-rt/java/util/ArrayList.java
-rt/java/util/Arrays.java
-rt/java/util/BitSet.java
-rt/java/util/Calendar.java
-rt/java/util/Collection.java
-rt/java/util/Collections.java
-rt/java/util/Comparator.java
-rt/java/util/ConcurrentModificationException.java
-rt/java/util/Currency.java
-rt/java/util/Date.java
-rt/java/util/Deque.java
-rt/java/util/Dictionary.java
-rt/java/util/DuplicateFormatFlagsException.java
-rt/java/util/EmptyStackException.java
-rt/java/util/Enumeration.java
-rt/java/util/EnumMap.java
-rt/java/util/EnumSet.java
-rt/java/util/EventListener.java
-rt/java/util/EventListenerProxy.java
-rt/java/util/EventObject.java
-rt/java/util/FormatFlagsConversionMismatchException.java
-rt/java/util/FormattableFlags.java
-rt/java/util/Formattable.java
-rt/java/util/FormatterClosedException.java
-rt/java/util/Formatter.java
-rt/java/util/GregorianCalendar.java
-rt/java/util/HashMap.java
-rt/java/util/HashSet.java
-rt/java/util/Hashtable.java
-rt/java/util/IdentityHashMap.java
-rt/java/util/IllegalFormatCodePointException.java
-rt/java/util/IllegalFormatConversionException.java
-rt/java/util/IllegalFormatException.java
-rt/java/util/IllegalFormatFlagsException.java
-rt/java/util/IllegalFormatPrecisionException.java
-rt/java/util/IllegalFormatWidthException.java
-rt/java/util/InputMismatchException.java
-rt/java/util/InvalidPropertiesFormatException.java
-rt/java/util/Iterator.java
-rt/java/util/JapaneseImperialCalendar.java
-rt/java/util/JumboEnumSet.java
-rt/java/util/LinkedHashMap.java
-rt/java/util/LinkedHashSet.java
-rt/java/util/LinkedList.java
-rt/java/util/ListIterator.java
-rt/java/util/List.java
-rt/java/util/ListResourceBundle.java
-rt/java/util/LocaleISOData.java
-rt/java/util/Locale.java
-rt/java/util/Map.java
-rt/java/util/MissingFormatArgumentException.java
-rt/java/util/MissingFormatWidthException.java
-rt/java/util/MissingResourceException.java
-rt/java/util/NavigableMap.java
-rt/java/util/NavigableSet.java
-rt/java/util/NoSuchElementException.java
-rt/java/util/Observable.java
-rt/java/util/Observer.java
-rt/java/util/PriorityQueue.java
-rt/java/util/Properties.java
-rt/java/util/PropertyPermission.java
-rt/java/util/PropertyResourceBundle.java
-rt/java/util/Queue.java
-rt/java/util/RandomAccess.java
-rt/java/util/Random.java
-rt/java/util/RegularEnumSet.java
-rt/java/util/ResourceBundle.java
-rt/java/util/Scanner.java
-rt/java/util/ServiceConfigurationError.java
-rt/java/util/ServiceLoader.java
-rt/java/util/Set.java
-rt/java/util/SimpleTimeZone.java
-rt/java/util/SortedMap.java
-rt/java/util/SortedSet.java
-rt/java/util/Stack.java
-rt/java/util/StringTokenizer.java
-rt/java/util/Timer.java
-rt/java/util/TimerTask.java
-rt/java/util/TimeZone.java
-rt/java/util/TooManyListenersException.java
-rt/java/util/TreeMap.java
-rt/java/util/TreeSet.java
-rt/java/util/UnknownFormatConversionException.java
-rt/java/util/UnknownFormatFlagsException.java
-rt/java/util/UUID.java
-rt/java/util/Vector.java
-rt/java/util/WeakHashMap.java
-rt/java/util/XMLUtils.java
-rt/java/rmi/AccessException.java
-rt/java/rmi/AlreadyBoundException.java
-rt/java/rmi/ConnectException.java
-rt/java/rmi/ConnectIOException.java
-rt/java/rmi/MarshalException.java
-rt/java/rmi/MarshalledObject.java
-rt/java/rmi/Naming.java
-rt/java/rmi/NoSuchObjectException.java
-rt/java/rmi/NotBoundException.java
-rt/java/rmi/RMISecurityException.java
-rt/java/rmi/RMISecurityManager.java
-rt/java/rmi/Remote.java
-rt/java/rmi/RemoteException.java
-rt/java/rmi/ServerError.java
-rt/java/rmi/ServerException.java
-rt/java/rmi/ServerRuntimeException.java
-rt/java/rmi/StubNotFoundException.java
-rt/java/rmi/UnexpectedException.java
-rt/java/rmi/UnknownHostException.java
-rt/java/rmi/UnmarshalException.java
-rt/sun/rmi/rmic/BatchEnvironment.java
-rt/sun/rmi/rmic/Constants.java
-rt/sun/rmi/rmic/Generator.java
-rt/sun/rmi/rmic/IndentingWriter.java
-rt/sun/rmi/rmic/Main.java
-rt/sun/rmi/rmic/Names.java
-rt/sun/rmi/rmic/RMIConstants.java
-rt/sun/rmi/rmic/RMIGenerator.java
-rt/sun/rmi/rmic/RemoteClass.java
-rt/sun/rmi/rmic/Util.java
-rt/javax/net/ssl/CertPathTrustManagerParameters.java
-rt/javax/net/ssl/HandshakeCompletedEvent.java
-rt/javax/net/ssl/HandshakeCompletedListener.java
-rt/javax/net/ssl/HostnameVerifier.java
-rt/javax/net/ssl/HttpsURLConnection.java
-rt/javax/net/ssl/KeyManager.java
-rt/javax/net/ssl/KeyManagerFactory.java
-rt/javax/net/ssl/KeyManagerFactorySpi.java
-rt/javax/net/ssl/KeyStoreBuilderParameters.java
-rt/javax/net/ssl/ManagerFactoryParameters.java
-rt/javax/net/ssl/SSLContext.java
-rt/javax/net/ssl/SSLContextSpi.java
-rt/javax/net/ssl/SSLEngine.java
-rt/javax/net/ssl/SSLEngineResult.java
-rt/javax/net/ssl/SSLException.java
-rt/javax/net/ssl/SSLHandshakeException.java
-rt/javax/net/ssl/SSLKeyException.java
-rt/javax/net/ssl/SSLParameters.java
-rt/javax/net/ssl/SSLPeerUnverifiedException.java
-rt/javax/net/ssl/SSLPermission.java
-rt/javax/net/ssl/SSLProtocolException.java
-rt/javax/net/ssl/SSLServerSocket.java
-rt/javax/net/ssl/SSLServerSocketFactory.java
-rt/javax/net/ssl/SSLSession.java
-rt/javax/net/ssl/SSLSessionBindingEvent.java
-rt/javax/net/ssl/SSLSessionBindingListener.java
-rt/javax/net/ssl/SSLSessionContext.java
-rt/javax/net/ssl/SSLSocket.java
-rt/javax/net/ssl/SSLSocketFactory.java
-rt/javax/net/ssl/TrustManager.java
-rt/javax/net/ssl/TrustManagerFactory.java
-rt/javax/net/ssl/TrustManagerFactorySpi.java
-rt/javax/net/ssl/X509ExtendedKeyManager.java
-rt/javax/net/ssl/X509KeyManager.java
-rt/javax/net/ssl/X509TrustManager.java
-rt/javax/script/AbstractScriptEngine.java
-rt/javax/script/Bindings.java
-rt/javax/script/Compilable.java
-rt/javax/script/CompiledScript.java
-rt/javax/script/Invocable.java
-rt/javax/script/ScriptContext.java
-rt/javax/script/ScriptEngine.java
-rt/javax/script/ScriptEngineFactory.java
-rt/javax/script/ScriptEngineManager.java
-rt/javax/script/ScriptException.java
-rt/javax/script/SimpleBindings.java
-rt/javax/script/SimpleScriptContext.java
-rt/java/io/
-rt/sun/awt
-rt/netscape/javascript/JSException.java
-rt/netscape/javascript/JSObject.java
-rt/netscape/javascript/JSProxy.java
-rt/netscape/javascript/JSRunnable.java
-rt/netscape/javascript/JSUtil.java
 generated/sun/awt/X11/generator/sizer.32.orig
 pulseaudio/bin
 pulseaudio/.*\.o
diff -r 04345d27c594 -r e0792821e2e7 ChangeLog
--- a/ChangeLog	Wed Feb 24 20:22:15 2010 +0000
+++ b/ChangeLog	Wed Feb 24 21:07:59 2010 +0000
@@ -1,3 +1,16 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* .hgignore: Severely trim the list
+	especially the use of regular expressions
+	which are matching unwanted files.
+
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(rewrite-rhino.stamp): Use full path to
+	jar application to avoid relying on the one
+	on the path.
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 04345d27c594 -r e0792821e2e7 Makefile.am
--- a/Makefile.am	Wed Feb 24 20:22:15 2010 +0000
+++ b/Makefile.am	Wed Feb 24 21:07:59 2010 +0000
@@ -1705,7 +1705,6 @@ extra-lib/about.jar: stamps/extra-class-
 
 if ENABLE_PULSE_JAVA
 $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
-	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
 	$(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
 	 -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
 
@@ -1741,6 +1740,7 @@ stamps/pulse-java-class.stamp: $(INITIAL
 	touch stamps/pulse-java-class.stamp
 
 stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
+	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
 	$(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) \
@@ -1792,7 +1792,8 @@ if WITH_RHINO
 	   sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \
 	 done \
 	)
-	(cd rhino/rhino.new ; jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
+	(cd rhino/rhino.new ; \
+	$(ICEDTEA_BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
 endif
 	mkdir -p stamps
 	touch stamps/rewrite-rhino.stamp


From gnu_andrew at member.fsf.org  Wed Feb 24 13:12:55 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Wed, 24 Feb 2010 21:12:55 +0000
Subject: .hgignore cleanup
Message-ID: <17c6771e1002241312o23df16e2k2581f8e087656074@mail.gmail.com>

I've just given the .hgignore file in IcedTea6 a desperately needed
pruning.  For some (presumably outdated) reason, it was using regular
expression matching while most of the actual entries were assuming
glob matches.
With the old version, hg status questioned 27 files in my checkout.
With the new one, it questions 54, including:

? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_EventLoop.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Operation_State.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioSourcePort.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioTargetPort.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_CorkListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_Format.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_LatencyUpdateListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_MovedListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_OverflowListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_PlaybackStartedListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_ReadListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_State.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_StateListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_SuspendedListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_UnderflowListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_UpdateTimingInfoListener.h
? pulseaudio/src/native/org_classpath_icedtea_pulseaudio_Stream_WriteListener.h

which were no doubt dumped there by some old build that decided to
generate them in tree and have been hidden by hg status ever since.

I also took the opportunity to get rid of a number of java files I
assume date back to the old days of encumbrance avoidance.  I was
tempted to do even more, but left some for those funny folks who build
in-tree.... :-(
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 jon.vanalten at redhat.com  Wed Feb 24 13:50:19 2010
From: jon.vanalten at redhat.com (jon.vanalten at redhat.com)
Date: Wed, 24 Feb 2010 16:50:19 -0500 (EST)
Subject: Test set for systemtap instrumentation
In-Reply-To: <1497917628.2775211267047771123.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com>
Message-ID: <2011078923.2776221267048219233.JavaMail.root@zmail01.collab.prod.int.phx2.redhat.com>

Hi,

For the past little while, I've been putting together a set of tests confirming functionality of the systemtap support that was added by Mark Wielaard.  Currently, it is able to test that probe aliases to markers in libjvm.so can be properly resolved by systemtap, and will fire when expected, for all probe aliases in hotspot.stp and hotspot_jni.stp.  The attached patch would create a "tapset" directory under the "test" directory, containing all source files needed as well as a script that builds and runs the tests.  Also, I've added comments regarding a necessary JVM option for a particular class of probes (not otherwise documented, but discovered during testing) to the appropriate probe descriptions in the hotspot_jni.stp tapset.

I'm planning on enhancing the script so that variables exposed at the probe points are checked for accuracy as well, but the point where I'm at now with all probes confirmed as firing seems a big milestone and I'd hate to lose what's here so far in a power surge or whatnot.

OK to commit?

cheers,

jon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jstaptest.patch
Type: text/x-patch
Size: 147631 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100224/c32e0ab4/jstaptest.patch 

From dbhole at icedtea.classpath.org  Wed Feb 24 13:59:36 2010
From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 21:59:36 +0000
Subject: /hg/icedtea6: Fix security permissions related to get/set proper...
Message-ID: <hg.e0451625a2db.1267048776.2873452341184383832@icedtea.classpath.org>

changeset e0451625a2db in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e0451625a2db
author: Deepak Bhole <dbhole at redhat.com>
date: Wed Feb 24 16:59:24 2010 -0500

	Fix security permissions related to get/set property, based on
	specifications

	* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some
	javaplugin.* properties that some applets expect.
	* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
	allowed property get/set based on specifications.


diffstat:

3 files changed, 88 insertions(+), 11 deletions(-)
ChangeLog                                                |    7 +
plugin/icedteanp/java/sun/applet/PluginMain.java         |    4 
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java |   88 ++++++++++++--

diffs (148 lines):

diff -r e0792821e2e7 -r e0451625a2db ChangeLog
--- a/ChangeLog	Wed Feb 24 21:07:59 2010 +0000
+++ b/ChangeLog	Wed Feb 24 16:59:24 2010 -0500
@@ -1,3 +1,10 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-24  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
+	properties that some applets expect.
+	* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
+	allowed property get/set based on specifications.
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* .hgignore: Severely trim the list
diff -r e0792821e2e7 -r e0451625a2db plugin/icedteanp/java/sun/applet/PluginMain.java
--- a/plugin/icedteanp/java/sun/applet/PluginMain.java	Wed Feb 24 21:07:59 2010 +0000
+++ b/plugin/icedteanp/java/sun/applet/PluginMain.java	Wed Feb 24 16:59:24 2010 -0500
@@ -189,6 +189,10 @@ public class PluginMain
 		avProps.put("file.separator.applet", "true");
 		avProps.put("path.separator.applet", "true");
 		avProps.put("line.separator.applet", "true");
+		
+		avProps.put("javaplugin.nodotversion", "160_17");
+		avProps.put("javaplugin.version", "1.6.0_17");
+		avProps.put("javaplugin.vm.options", "");
 
 		// Read in the System properties.  If something is going to be
 		// over-written, warn about it.
diff -r e0792821e2e7 -r e0451625a2db rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java
--- a/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Wed Feb 24 21:07:59 2010 +0000
+++ b/rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java	Wed Feb 24 16:59:24 2010 -0500
@@ -27,6 +27,7 @@ import java.security.AccessController;
 import java.security.AccessController;
 import java.security.Permission;
 import java.security.PrivilegedAction;
+import java.util.PropertyPermission;
 
 import javax.swing.JWindow;
 
@@ -288,7 +289,7 @@ class JNLPSecurityManager extends Securi
 				//Change this SocketPermission's action to connect and accept
 				//(and resolve). This is to avoid asking for connect permission 
 				//on every address resolve.
-				Permission tmpPerm;
+				Permission tmpPerm = null;
 				if (perm instanceof SocketPermission) {
 					tmpPerm = new SocketPermission(perm.getName(), 
 							SecurityConstants.SOCKET_CONNECT_ACCEPT_ACTION);
@@ -332,16 +333,81 @@ class JNLPSecurityManager extends Securi
 						}
 					}
 
-				} else
-					tmpPerm = perm;
-				
-				//askPermission will only prompt the user on SocketPermission 
-				//meaning we're denying all other SecurityExceptions that may arise.
-				if (askPermission(tmpPerm)) {
-					addPermission(tmpPerm);
-					//return quietly.
+				} else if (perm instanceof PropertyPermission) {
+
+				    if (JNLPRuntime.isDebug())
+				        System.err.println("Requesting property: " + perm.toString());
+
+				    // We go by the rules here:
+				    // http://java.sun.com/docs/books/tutorial/deployment/doingMoreWithRIA/properties.html
+
+				    // Since this is security sensitive, take a conservative approach:
+				    // Allow only what is specifically allowed, and deny everything else
+
+				    // First, allow what everyone is allowed to read
+				    if (perm.getActions().equals("read")) {
+				        if (    perm.getName().equals("java.class.version") ||
+				                perm.getName().equals("java.vendor") ||
+				                perm.getName().equals("java.vendor.url")  ||
+				                perm.getName().equals("java.version") ||
+				                perm.getName().equals("os.name") ||
+				                perm.getName().equals("os.arch") ||
+				                perm.getName().equals("os.version") ||
+				                perm.getName().equals("file.separator") ||
+				                perm.getName().equals("path.separator") ||
+				                perm.getName().equals("line.separator") ||
+				                perm.getName().startsWith("javaplugin.")
+				            ) {
+				            return;
+				        }
+				    }
+
+				    // Next, allow what only JNLP apps can do
+				    if (getApplication().getJNLPFile().isApplication()) {
+				        if (    perm.getName().equals("awt.useSystemAAFontSettings") ||
+				                perm.getName().equals("http.agent") ||
+				                perm.getName().equals("http.keepAlive") ||
+				                perm.getName().equals("java.awt.syncLWRequests") ||
+				                perm.getName().equals("java.awt.Window.locationByPlatform") ||
+				                perm.getName().equals("javaws.cfg.jauthenticator") ||
+				                perm.getName().equals("javax.swing.defaultlf") ||
+				                perm.getName().equals("sun.awt.noerasebackground") ||
+				                perm.getName().equals("sun.awt.erasebackgroundonresize") ||
+				                perm.getName().equals("sun.java2d.d3d") ||
+				                perm.getName().equals("sun.java2d.dpiaware") ||
+				                perm.getName().equals("sun.java2d.noddraw") ||
+				                perm.getName().equals("sun.java2d.opengl") ||
+				                perm.getName().equals("swing.boldMetal") ||
+				                perm.getName().equals("swing.metalTheme") ||
+				                perm.getName().equals("swing.noxp") ||
+				                perm.getName().equals("swing.useSystemFontSettings")
+				        ) {
+				            return; // JNLP apps can read and write to these
+				        }
+				    }
+
+				    // Next, allow access to customizable properties 
+				    if (perm.getName().startsWith("jnlp.") || 
+				        perm.getName().startsWith("javaws.")) {
+				        return;
+				    }
+
+				    // Everything else is denied
+				    throw se;
+
 				} else {
-					throw se;
+				    tmpPerm = perm;
+				}
+
+				if (tmpPerm != null) {
+				    //askPermission will only prompt the user on SocketPermission 
+				    //meaning we're denying all other SecurityExceptions that may arise.
+				    if (askPermission(tmpPerm)) {
+				        addPermission(tmpPerm);
+				        //return quietly.
+				    } else {
+				        throw se;
+				    }
 				}
 			}
         }
@@ -352,7 +418,7 @@ class JNLPSecurityManager extends Securi
             throw ex;
         }
     }
-    
+
     /**
      * Asks the user whether or not to grant permission.
      * @param perm the permission to be granted


From andrew at icedtea.classpath.org  Wed Feb 24 15:30:26 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Wed, 24 Feb 2010 23:30:26 +0000
Subject: /hg/icedtea6: Ensure THANKYOU is distributed in the tarball.  Re...
Message-ID: <hg.3ba35c5b6fd9.1267054226.2873452341184383832@icedtea.classpath.org>

changeset 3ba35c5b6fd9 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3ba35c5b6fd9
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 23:30:18 2010 +0000

	Ensure THANKYOU is distributed in the tarball. Remove duplicate
	AUTHORS file.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add THANKYOU to EXTRA_DIST.
		* pulseaudio/AUTHORS: Removed; duplicates top-level file.


diffstat:

3 files changed, 9 insertions(+), 6 deletions(-)
ChangeLog          |    7 +++++++
Makefile.am        |    3 ++-
pulseaudio/AUTHORS |    5 -----

diffs (37 lines):

diff -r e0451625a2db -r 3ba35c5b6fd9 ChangeLog
--- a/ChangeLog	Wed Feb 24 16:59:24 2010 -0500
+++ b/ChangeLog	Wed Feb 24 23:30:18 2010 +0000
@@ -1,3 +1,10 @@ 2010-02-24  Deepak Bhole <dbhole at redhat.
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add THANKYOU to
+	EXTRA_DIST.
+	* pulseaudio/AUTHORS: Removed; duplicates
+	top-level file.
+
 2010-02-24  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
diff -r e0451625a2db -r 3ba35c5b6fd9 Makefile.am
--- a/Makefile.am	Wed Feb 24 16:59:24 2010 -0500
+++ b/Makefile.am	Wed Feb 24 23:30:18 2010 +0000
@@ -598,7 +598,8 @@ EXTRA_DIST = rt generated \
 	scripts/jni_create_stap.c \
 	scripts/jni_desc \
 	rewriter/agpl-3.0.txt \
-	$(REWRITER_SRCS)
+	$(REWRITER_SRCS) \
+	THANKYOU
 
 # Top-Level Targets
 # =================
diff -r e0451625a2db -r 3ba35c5b6fd9 pulseaudio/AUTHORS
--- a/pulseaudio/AUTHORS	Wed Feb 24 16:59:24 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-Authors
-
-Ioana Iivan (iivan at redhat.com)
-
-Omair Majid (omajid at redhat.com)
\ No newline at end of file


From andrew at icedtea.classpath.org  Thu Feb 25 04:21:58 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Thu, 25 Feb 2010 12:21:58 +0000
Subject: /hg/icedtea6: Handle clean-pulse-java being undefined.
Message-ID: <hg.b50fed90f978.1267100518.2873452341184383832@icedtea.classpath.org>

changeset b50fed90f978 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b50fed90f978
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Feb 25 12:21:49 2010 +0000

	Handle clean-pulse-java being undefined.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add PULSE_JAVA_CLEAN_TARGET to handle
	optionally defined clean-pulse-java target.


diffstat:

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

diffs (33 lines):

diff -r 3ba35c5b6fd9 -r b50fed90f978 ChangeLog
--- a/ChangeLog	Wed Feb 24 23:30:18 2010 +0000
+++ b/ChangeLog	Thu Feb 25 12:21:49 2010 +0000
@@ -1,3 +1,9 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add PULSE_JAVA_CLEAN_TARGET
+	to handle optionally defined clean-pulse-java
+	target.
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add THANKYOU to
diff -r 3ba35c5b6fd9 -r b50fed90f978 Makefile.am
--- a/Makefile.am	Wed Feb 24 23:30:18 2010 +0000
+++ b/Makefile.am	Thu Feb 25 12:21:49 2010 +0000
@@ -175,6 +175,7 @@ PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DI
 PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
 PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
 PULSE_JAVA_TARGET = stamps/pulse-java.stamp
+PULSE_JAVA_CLEAN_TARGET = clean-pulse-java
 endif
 
 # FIXME (HotSpot): no longer needed
@@ -609,7 +610,7 @@ check-local: jtregcheck
 check-local: jtregcheck
 
 #FIXME (clean): Should become clean-local.
-distclean-local: clean-copy clean-jtreg clean-jtreg-reports clean-pulse-java 
+distclean-local: clean-copy clean-jtreg clean-jtreg-reports $(PULSE_JAVA_CLEAN_TARGET)
 	rm -rf stamps
 	rm -f rt-source-files.txt \
 	  extra-source-files.txt


From libic at dsrg.mff.cuni.cz  Thu Feb 25 04:31:56 2010
From: libic at dsrg.mff.cuni.cz (Peter Libic)
Date: Thu, 25 Feb 2010 13:31:56 +0100
Subject: Building modified OpenJDK with IcedTea?
Message-ID: <4B866DBC.20604@dsrg.mff.cuni.cz>

Hi,

I am doing some performance measurements of GCs in Java and I need to make
some instrumentation in the virtual machine to get required data.

I was thinking of using IcedTea for this - building working JVM from OpenJDK
is quite difficult for me.

So, I'd like to ask, if there's some simple way how the IcedTea could use my
modified copy of OpenJDK (without rebuilding from scratch at every build)?

Thanks,

Peter Libic


From gnu_andrew at member.fsf.org  Thu Feb 25 04:41:49 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Thu, 25 Feb 2010 12:41:49 +0000
Subject: Building modified OpenJDK with IcedTea?
In-Reply-To: <4B866DBC.20604@dsrg.mff.cuni.cz>
References: <4B866DBC.20604@dsrg.mff.cuni.cz>
Message-ID: <17c6771e1002250441s2ac11e60x8786cd9d68399dcc@mail.gmail.com>

On 25 February 2010 12:31, Peter Libic <libic at dsrg.mff.cuni.cz> wrote:
> Hi,
>
> I am doing some performance measurements of GCs in Java and I need to make
> some instrumentation in the virtual machine to get required data.
>
> I was thinking of using IcedTea for this - building working JVM from OpenJDK
> is quite difficult for me.
>
> So, I'd like to ask, if there's some simple way how the IcedTea could use my
> modified copy of OpenJDK (without rebuilding from scratch at every build)?
>
> Thanks,
>
> Peter Libic
>

The configure option --with-openjdk-src-dir=<path to dir> :-)
That's how I test with the latest OpenJDK6 from Mercurial.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 icedtea.classpath.org  Thu Feb 25 19:59:08 2010
From: dbhole at icedtea.classpath.org (dbhole at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 03:59:08 +0000
Subject: /hg/release/icedtea6-1.7: 6 new changesets
Message-ID: <hg.6e4b712d16b6.1267156748.1785565629229908553@icedtea.classpath.org>

changeset 6e4b712d16b6 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6e4b712d16b6
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Feb 25 22:41:59 2010 -0500

	- Import from main line

	- Re-designed frame embedding code so that the applet is dynamically
	packed into given handle. This increases stability and breaks
	reliance on the assumption that the browser will always provide a
	handle in a certain sequence.


changeset e1aa8a1748cb in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e1aa8a1748cb
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Feb 25 22:43:56 2010 -0500

	- Import from main line
	- Added tests for JSObject.eval()


changeset 969ccd883d23 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=969ccd883d23
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Feb 25 22:45:36 2010 -0500

	- Import from main line

	- Encode new lines, carriage returns, and other special characters
	before sending them to Java side (de-coding code is already in
	effect on Java side).


changeset cad2a2d3f4cd in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cad2a2d3f4cd
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Feb 25 22:55:12 2010 -0500

	- Import from main line

	- Centralized and increased timeouts to give slow-loading applets
	enough time to load.


changeset 58b42ff925ea in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=58b42ff925ea
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Feb 25 22:56:45 2010 -0500

	- Import from main line

	- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi
	version.


changeset 728d7fbb5008 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=728d7fbb5008
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Feb 25 22:58:15 2010 -0500

	- Import from main line

	- Fix security permissions related to get/set property, based on
	specifications

	* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some
	javaplugin.* properties that some applets expect.
	* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
	allowed property get/set based on specifications.


diffstat:

10 files changed, 1184 insertions(+), 933 deletions(-)
ChangeLog                                                |   40 
Makefile.am                                              |    1 
plugin/icedteanp/IcedTeaNPPlugin.cc                      |   37 
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 1874 +++++++-------
plugin/icedteanp/java/sun/applet/PluginMain.java         |    4 
plugin/tests/LiveConnect/PluginTest.java                 |   11 
plugin/tests/LiveConnect/common.js                       |    3 
plugin/tests/LiveConnect/index.html                      |    2 
plugin/tests/LiveConnect/jjs_eval_test.js                |   57 
rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java |   88 

diffs (truncated from 2742 to 500 lines):

diff -r f4d6e5d2be10 -r 728d7fbb5008 ChangeLog
--- a/ChangeLog	Wed Feb 24 16:34:02 2010 +0100
+++ b/ChangeLog	Thu Feb 25 22:58:15 2010 -0500
@@ -1,3 +1,43 @@ 2010-02-24 Pavel Tisnovsky  <ptisnovs at re
+2010-02-25  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
+	properties that some applets expect.
+	* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
+	allowed property get/set based on specifications.
+
+2010-02-25  Deepak Bhole <dbhole at redhat.com>
+
+	* Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
+	* plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
+	jpi version.
+
+2010-02-25  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
+	and increased timeouts to give slow-loading applets enough time to load.
+
+2010-02-25  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/IcedTeaNPPlugin.cc 
+	(plugin_create_applet_tag): Encode new lines, carriage returns, and
+	other special characters before sending them to Java side (de-coding
+	code is already in effect on Java side).
+
+2010-02-25  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/tests/LiveConnect/PluginTest.java
+	(jjsEvalTest): New function. Calls JSObject.eval() with given string.
+	* plugin/tests/LiveConnect/common.js: Added eval test suite as one of the
+	run options.
+	* plugin/tests/LiveConnect/index.html: Same.
+	* plugin/tests/LiveConnect/jjs_eval_test.js: Eval tests.
+
+2010-02-25  Deepak Bhole <dbhole at redhat.com>
+
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Re-designed
+	frame embedding code so that the applet is dynamically packed into given
+	handle.
+
 2010-02-24 Pavel Tisnovsky  <ptisnovs at redhat.com>
 	* Makefile.am: Corrected Pulse Audio
 	library build
diff -r f4d6e5d2be10 -r 728d7fbb5008 Makefile.am
--- a/Makefile.am	Wed Feb 24 16:34:02 2010 +0100
+++ b/Makefile.am	Thu Feb 25 22:58:15 2010 -0500
@@ -1499,6 +1499,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 	mkdir -p $(NPPLUGIN_DIR) && \
 	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
+	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  $(GLIB_CFLAGS) \
diff -r f4d6e5d2be10 -r 728d7fbb5008 plugin/icedteanp/IcedTeaNPPlugin.cc
--- a/plugin/icedteanp/IcedTeaNPPlugin.cc	Wed Feb 24 16:34:02 2010 +0100
+++ b/plugin/icedteanp/IcedTeaNPPlugin.cc	Thu Feb 25 22:58:15 2010 -0500
@@ -107,7 +107,7 @@ exception statement from your version. *
   "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-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":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;"           \
@@ -123,7 +123,7 @@ exception statement from your version. *
   "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;"    \
+  "application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;"    \
   "application/x-java-vm-npruntime::IcedTea;"
 
 #define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
@@ -1575,13 +1575,40 @@ plugin_create_applet_tag (int16_t argc, 
           // characters will pass through the pipe.
           if (argv[i] != '\0')
             {
-              gchar* escaped = NULL;
+              // worst case scenario -> all characters are newlines or
+              // returns, each of which translates to 5 substitutions
+              char* escaped = (char*) calloc(((strlen(argv[i])*5)+1), sizeof(char));
 
-              escaped = g_strescape (argv[i], NULL);
+              strcpy(escaped, "");
+              for (int j=0; j < strlen(argv[i]); j++)
+              {
+                  if (argv[i][j] == '\r')
+                      strcat(escaped, "&#13;");
+                  else if (argv[i][j] == '\n')
+                      strcat(escaped, "&#10;");
+                  else if (argv[i][j] == '>')
+                      strcat(escaped, "&gt;");
+                  else if (argv[i][j] == '<')
+                      strcat(escaped, "&lt;");
+                  else if (argv[i][j] == '&')
+                      strcat(escaped, "&amp;");
+                  else
+                  {
+                      char* orig_char = (char*) calloc(2, sizeof(char));
+                      orig_char[0] = argv[i][j];
+                      orig_char[1] = '\0';
+
+                      strcat(escaped, orig_char);
+
+                      free(orig_char);
+                      orig_char = NULL;
+                  }
+              }
+
               parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn[i],
                                         "\" VALUE=\"", escaped, "\">", NULL);
 
-              g_free (escaped);
+              free (escaped);
               escaped = NULL;
             }
         }
diff -r f4d6e5d2be10 -r 728d7fbb5008 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Wed Feb 24 16:34:02 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Feb 25 22:58:15 2010 -0500
@@ -91,6 +91,7 @@ import java.net.URI;
 import java.net.URI;
 import java.net.URL;
 import java.security.AccessController;
+import java.security.AllPermission;
 import java.security.PrivilegedAction;
 import java.util.Enumeration;
 import java.util.HashMap;
@@ -114,18 +115,199 @@ import com.sun.jndi.toolkit.url.UrlUtil;
   * Lets us construct one using unix-style one shot behaviors
   */
  
- class PluginAppletViewerFactory
+ class PluginAppletPanelFactory
  {
-     public PluginAppletViewer createAppletViewer(int identifier,
-                                                  long handle, int x, int y,
- 						 URL doc, Hashtable atts) {
-         PluginAppletViewer pluginappletviewer = new PluginAppletViewer(identifier, handle, x, y, doc, atts, System.out, this);
-         return pluginappletviewer;
+
+     public AppletPanel createPanel(PluginStreamHandler streamhandler, 
+                                    int identifier,
+                                    long handle, int x, int y,
+                                    final URL doc, final Hashtable atts) {
+
+         AppletViewerPanel panel = (AppletViewerPanel) AccessController.doPrivileged(new PrivilegedAction() {
+             public Object run() {
+                    try {
+                        AppletPanel panel = new NetxPanel(doc, atts, false);
+                        AppletViewerPanel.debug("Using NetX panel");
+                        PluginDebug.debug(atts.toString());
+                        return panel;
+                    } catch (Exception ex) {
+                        AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
+                        return new AppletViewerPanel(doc, atts);
+                    }
+             }
+         });
+
+         double heightFactor = 1.0;
+         double widthFactor = 1.0;
+
+         if (atts.get("heightPercentage") != null) {
+             heightFactor = (Integer) atts.get("heightPercentage")/100.0;
+         }
+         
+         if (atts.get("widthPercentage") != null) {
+             widthFactor = (Integer) atts.get("widthPercentage")/100.0;
+         }
+         
+
+         // put inside initial 0 handle frame
+         PluginAppletViewer.reFrame(null, identifier, System.out, 
+                 heightFactor, widthFactor, 0, panel);
+         
+         panel.init();
+
+         // Start the applet
+         initEventQueue(panel);
+
+         // Applet initialized. Find out it's classloader and add it to the list
+         String portComponent = doc.getPort() != -1 ? ":" + doc.getPort() : "";
+         String codeBase = doc.getProtocol() + "://" + doc.getHost() + portComponent;
+
+         if (atts.get("codebase") != null) {
+             try {
+                 URL appletSrcURL = new URL(codeBase + (String) atts.get("codebase"));
+                 codeBase = appletSrcURL.getProtocol() + "://" + appletSrcURL.getHost();
+             } catch (MalformedURLException mfue) {
+                 // do nothing
+             }
+         }
+
+
+         // Wait for the panel to initialize
+         // (happens in a separate thread)
+         Applet a;
+         
+         // Wait for panel to come alive
+         int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
+         int wait = 0;
+         while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
+              try {
+                  Thread.sleep(50);
+                  wait += 50;
+              } catch (InterruptedException ie) {
+                  ie.printStackTrace();
+              }
+         }
+         
+         // Wait for the panel to initialize
+         // (happens in a separate thread)
+         while (panel.getApplet() == null &&
+                ((NetxPanel) panel).isAlive()) {
+             try {
+                 Thread.sleep(50);
+                 PluginDebug.debug("Waiting for applet to initialize...");
+             } catch (InterruptedException ie) {
+                 ie.printStackTrace();
+             }
+         }
+
+         a = panel.getApplet();
+
+         // Still null?
+         if (panel.getApplet() == null) {
+             streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
+             return null;
+         }
+
+         PluginDebug.debug("Applet " + a.getClass() + " initialized");
+         streamhandler.write("instance " + identifier + " initialized");
+         
+         AppletSecurityContextManager.getSecurityContext(0).associateSrc(((NetxPanel) panel).getAppletClassLoader(), doc);
+         AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, ((NetxPanel) panel).getAppletClassLoader());
+         
+         return panel;
      }
  
      public boolean isStandalone()
      {
          return false;
+     }
+     
+     /**
+      * Send the initial set of events to the appletviewer event queue.
+      * On start-up the current behaviour is to load the applet and call
+      * Applet.init() and Applet.start().
+      */
+     private void initEventQueue(AppletPanel panel) {
+         // appletviewer.send.event is an undocumented and unsupported system
+         // property which is used exclusively for testing purposes.
+         PrivilegedAction pa = new PrivilegedAction() {
+             public Object run() {
+                 return System.getProperty("appletviewer.send.event");
+             }
+         };
+         String eventList = (String) AccessController.doPrivileged(pa); 
+
+         if (eventList == null) {
+             // Add the standard events onto the event queue.
+             panel.sendEvent(AppletPanel.APPLET_LOAD);
+             panel.sendEvent(AppletPanel.APPLET_INIT);
+             panel.sendEvent(AppletPanel.APPLET_START);
+         } else {
+             // We're testing AppletViewer.  Force the specified set of events
+             // onto the event queue, wait for the events to be processed, and
+             // exit.
+
+             // The list of events that will be executed is provided as a
+             // ","-separated list.  No error-checking will be done on the list.
+             String [] events = splitSeparator(",", eventList);
+
+             for (int i = 0; i < events.length; i++) {
+                 PluginDebug.debug("Adding event to queue: " + events[i]);
+                 if (events[i].equals("dispose"))
+                     panel.sendEvent(AppletPanel.APPLET_DISPOSE);
+                 else if (events[i].equals("load"))
+                     panel.sendEvent(AppletPanel.APPLET_LOAD);
+                 else if (events[i].equals("init"))
+                     panel.sendEvent(AppletPanel.APPLET_INIT);
+                 else if (events[i].equals("start"))
+                     panel.sendEvent(AppletPanel.APPLET_START);
+                 else if (events[i].equals("stop"))
+                     panel.sendEvent(AppletPanel.APPLET_STOP);
+                 else if (events[i].equals("destroy"))
+                     panel.sendEvent(AppletPanel.APPLET_DESTROY);
+                 else if (events[i].equals("quit"))
+                     panel.sendEvent(AppletPanel.APPLET_QUIT);
+                 else if (events[i].equals("error"))
+                     panel.sendEvent(AppletPanel.APPLET_ERROR);
+                 else
+                     // non-fatal error if we get an unrecognized event
+                     PluginDebug.debug("Unrecognized event name: " + events[i]);
+             }
+
+             while (!panel.emptyEventQueue()) ;
+         }
+     }
+     
+     
+     /**
+      * Split a string based on the presence of a specified separator.  Returns
+      * an array of arbitrary length.  The end of each element in the array is
+      * indicated by the separator of the end of the string.  If there is a
+      * separator immediately before the end of the string, the final element
+      * will be empty.  None of the strings will contain the separator.  Useful
+      * when separating strings such as "foo/bar/bas" using separator "/".
+      *
+      * @param sep  The separator.
+      * @param s    The string to split.
+      * @return     An array of strings.  Each string in the array is determined
+      *             by the location of the provided sep in the original string,
+      *             s.  Whitespace not stripped.
+      */
+     private String [] splitSeparator(String sep, String s) {
+         Vector v = new Vector();
+         int tokenStart = 0;
+         int tokenEnd   = 0;
+
+         while ((tokenEnd = s.indexOf(sep, tokenStart)) != -1) {
+             v.addElement(s.substring(tokenStart, tokenEnd));
+             tokenStart = tokenEnd+1;
+         }
+         // Add the final element.
+         v.addElement(s.substring(tokenStart));
+
+         String [] retVal = new String[v.size()];
+         v.copyInto(retVal);
+         return retVal;
      }
  }
  
@@ -146,7 +328,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
       */
      private static String defaultSaveFile = "Applet.ser";
      
-     private static enum PAV_INIT_STATUS {PRE_INIT, ACTIVE, INACTIVE};
+     private static enum PAV_INIT_STATUS {PRE_INIT, IN_INIT, INIT_COMPLETE, INACTIVE};
 
      /**
       * The panel in which the applet is being displayed.
@@ -163,11 +345,6 @@ import com.sun.jndi.toolkit.url.UrlUtil;
       */
  
      PrintStream statusMsgStream;
- 
-     /**
-      * For cloning
-      */
-     PluginAppletViewerFactory factory;
  
      int identifier;
  
@@ -187,204 +364,155 @@ import com.sun.jndi.toolkit.url.UrlUtil;
 
      private double proposedHeightFactor;
      private double proposedWidthFactor;
+     
+     private long handle = 0;
+     private WindowListener windowEventListener = null;
+     private AppletEventListener appletEventListener = null;
+     
+     public static final int APPLET_TIMEOUT = 60000;
 
      /**
       * Null constructor to allow instantiation via newInstance()
       */
      public PluginAppletViewer() {
      }
-     
-     /**
-      * Create the applet viewer
-      */
-     public PluginAppletViewer(final int identifier, long handle, int x, int y, final URL doc,
-                               final Hashtable atts, PrintStream statusMsgStream,
-                               PluginAppletViewerFactory factory) {
-         super(handle, true);
-    	this.factory = factory;
- 	this.statusMsgStream = statusMsgStream;
-         this.identifier = identifier;
-         // FIXME: when/where do we remove this?
-         PluginDebug.debug ("PARSING: PUTTING " + identifier + " " + this);
-         applets.put(identifier, this);
+
+     public static void reFrame(PluginAppletViewer oldFrame, 
+                         int identifier, PrintStream statusMsgStream, 
+                         double heightFactor, double widthFactor, long handle,
+                         AppletViewerPanel panel) {
+
+         PluginDebug.debug("Reframing " + panel);
          
-         
-         // we intercept height and width specifications here because 
-         proposedHeightFactor = 1.0;
-         proposedWidthFactor = 1.0;
+         // SecurityManager MUST be set, and only privileged code may call reFrame()
+         System.getSecurityManager().checkPermission(new AllPermission());
 
-         if (atts.get("heightPercentage") != null) {
-        	 proposedHeightFactor = (Integer) atts.get("heightPercentage")/100.0;
+         // Same handle => nothing to do
+         if (oldFrame != null && handle == oldFrame.handle)
+             return;
+
+         PluginAppletViewer newFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, heightFactor, widthFactor);
+         newFrame.panel = panel;
+
+         if (oldFrame != null) {
+             applets.remove(oldFrame.identifier);
+             oldFrame.removeWindowListener(oldFrame.windowEventListener);
+             panel.removeAppletListener(oldFrame.appletEventListener);
+             oldFrame.remove(panel);
+             oldFrame.dispose();
+         }
+
+         newFrame.add("Center", panel);
+         newFrame.pack();
+
+         newFrame.appletEventListener = new AppletEventListener(newFrame, newFrame);
+         panel.addAppletListener(newFrame.appletEventListener);
+
+         applets.put(identifier, newFrame);
+
+         // dispose oldframe if necessary
+         if (oldFrame != null) {
+             oldFrame.dispose();
          }
          
-         if (atts.get("widthPercentage") != null) {
-        	 proposedWidthFactor = (Integer) atts.get("widthPercentage")/100.0;
+         PluginDebug.debug(panel + " reframed");
+     }
+
+     /**
+      * Create new plugin appletviewer frame
+      */
+     private PluginAppletViewer(long handle, final int identifier, 
+                         PrintStream statusMsgStream, double heightFactor, 
+                         double widthFactor) {
+         
+         super(handle, true);
+         this.statusMsgStream = statusMsgStream;
+         this.identifier = identifier;
+         this.proposedHeightFactor = heightFactor;
+         this.proposedWidthFactor = widthFactor;
+
+         if (!appletPanels.contains(panel))
+             appletPanels.addElement(panel);
+
+         windowEventListener = new WindowAdapter() {
+
+             public void windowClosing(WindowEvent evt) {
+                 appletClose();
+             }
+
+             public void windowIconified(WindowEvent evt) {
+                 appletStop();
+             }
+
+             public void windowDeiconified(WindowEvent evt) {
+                 appletStart();
+             }
+         };
+
+         addWindowListener(windowEventListener);
+
+     }
+
+     private static class AppletEventListener implements AppletListener  
+     {
+         final Frame frame;
+         final PluginAppletViewer appletViewer;
+  
+         public AppletEventListener(Frame frame, PluginAppletViewer appletViewer)
+         {
+         this.frame = frame;
+         this.appletViewer = appletViewer;
          }
- 
-         AccessController.doPrivileged(new PrivilegedAction() {
-             public Object run() {
-            	 	try {
-            	 		panel = new NetxPanel(doc, atts, false);
-            	 		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);
-            	 	}
-                 return null;
+  
+         public void appletStateChanged(AppletEvent evt) 


From gnu_andrew at member.fsf.org  Fri Feb 26 04:37:17 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 12:37:17 +0000
Subject: /hg/release/icedtea6-1.7: 6 new changesets
In-Reply-To: <hg.6e4b712d16b6.1267156748.1785565629229908553@icedtea.classpath.org>
References: <hg.6e4b712d16b6.1267156748.1785565629229908553@icedtea.classpath.org>
Message-ID: <17c6771e1002260437i1a34a913n3b5380eaca4a0bc3@mail.gmail.com>

On 26 February 2010 03:59,  <dbhole at icedtea.classpath.org> wrote:
> changeset 6e4b712d16b6 in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6e4b712d16b6
> author: Deepak Bhole <dbhole at redhat.com>
> date: Thu Feb 25 22:41:59 2010 -0500
>
> ? ? ? ?- Import from main line
>
> ? ? ? ?- Re-designed frame embedding code so that the applet is dynamically
> ? ? ? ?packed into given handle. This increases stability and breaks
> ? ? ? ?reliance on the assumption that the browser will always provide a
> ? ? ? ?handle in a certain sequence.
>
>
> changeset e1aa8a1748cb in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e1aa8a1748cb
> author: Deepak Bhole <dbhole at redhat.com>
> date: Thu Feb 25 22:43:56 2010 -0500
>
> ? ? ? ?- Import from main line
> ? ? ? ?- Added tests for JSObject.eval()
>
>
> changeset 969ccd883d23 in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=969ccd883d23
> author: Deepak Bhole <dbhole at redhat.com>
> date: Thu Feb 25 22:45:36 2010 -0500
>
> ? ? ? ?- Import from main line
>
> ? ? ? ?- Encode new lines, carriage returns, and other special characters
> ? ? ? ?before sending them to Java side (de-coding code is already in
> ? ? ? ?effect on Java side).
>
>
> changeset cad2a2d3f4cd in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cad2a2d3f4cd
> author: Deepak Bhole <dbhole at redhat.com>
> date: Thu Feb 25 22:55:12 2010 -0500
>
> ? ? ? ?- Import from main line
>
> ? ? ? ?- Centralized and increased timeouts to give slow-loading applets
> ? ? ? ?enough time to load.
>
>
> changeset 58b42ff925ea in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=58b42ff925ea
> author: Deepak Bhole <dbhole at redhat.com>
> date: Thu Feb 25 22:56:45 2010 -0500
>
> ? ? ? ?- Import from main line
>
> ? ? ? ?- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi
> ? ? ? ?version.
>
>
> changeset 728d7fbb5008 in /hg/release/icedtea6-1.7
> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=728d7fbb5008
> author: Deepak Bhole <dbhole at redhat.com>
> date: Thu Feb 25 22:58:15 2010 -0500
>
> ? ? ? ?- Import from main line
>
> ? ? ? ?- Fix security permissions related to get/set property, based on
> ? ? ? ?specifications
>
> ? ? ? ?* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some
> ? ? ? ?javaplugin.* properties that some applets expect.
> ? ? ? ?* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
> ? ? ? ?allowed property get/set based on specifications.
>
>
> diffstat:
>
> 10 files changed, 1184 insertions(+), 933 deletions(-)
> ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 40
> Makefile.am ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1
> plugin/icedteanp/IcedTeaNPPlugin.cc ? ? ? ? ? ? ? ? ? ? ?| ? 37
> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 1874 +++++++-------
> plugin/icedteanp/java/sun/applet/PluginMain.java ? ? ? ? | ? ?4
> plugin/tests/LiveConnect/PluginTest.java ? ? ? ? ? ? ? ? | ? 11
> plugin/tests/LiveConnect/common.js ? ? ? ? ? ? ? ? ? ? ? | ? ?3
> plugin/tests/LiveConnect/index.html ? ? ? ? ? ? ? ? ? ? ?| ? ?2
> plugin/tests/LiveConnect/jjs_eval_test.js ? ? ? ? ? ? ? ?| ? 57
> rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | ? 88
>
> diffs (truncated from 2742 to 500 lines):
>
> diff -r f4d6e5d2be10 -r 728d7fbb5008 ChangeLog
> --- a/ChangeLog Wed Feb 24 16:34:02 2010 +0100
> +++ b/ChangeLog Thu Feb 25 22:58:15 2010 -0500
> @@ -1,3 +1,43 @@ 2010-02-24 Pavel Tisnovsky ?<ptisnovs at re
> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
> + ? ? ? properties that some applets expect.
> + ? ? ? * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
> + ? ? ? allowed property get/set based on specifications.
> +
> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
> + ? ? ? * plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
> + ? ? ? jpi version.
> +
> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
> + ? ? ? and increased timeouts to give slow-loading applets enough time to load.
> +
> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * plugin/icedteanp/IcedTeaNPPlugin.cc
> + ? ? ? (plugin_create_applet_tag): Encode new lines, carriage returns, and
> + ? ? ? other special characters before sending them to Java side (de-coding
> + ? ? ? code is already in effect on Java side).
> +
> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * plugin/tests/LiveConnect/PluginTest.java
> + ? ? ? (jjsEvalTest): New function. Calls JSObject.eval() with given string.
> + ? ? ? * plugin/tests/LiveConnect/common.js: Added eval test suite as one of the
> + ? ? ? run options.
> + ? ? ? * plugin/tests/LiveConnect/index.html: Same.
> + ? ? ? * plugin/tests/LiveConnect/jjs_eval_test.js: Eval tests.
> +
> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
> +
> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Re-designed
> + ? ? ? frame embedding code so that the applet is dynamically packed into given
> + ? ? ? handle.
> +
> ?2010-02-24 Pavel Tisnovsky ?<ptisnovs at redhat.com>
> ? ? ? ?* Makefile.am: Corrected Pulse Audio
> ? ? ? ?library build
> diff -r f4d6e5d2be10 -r 728d7fbb5008 Makefile.am
> --- a/Makefile.am ? ? ? Wed Feb 24 16:34:02 2010 +0100
> +++ b/Makefile.am ? ? ? Thu Feb 25 22:58:15 2010 -0500
> @@ -1499,6 +1499,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
> ? ? ? ?mkdir -p $(NPPLUGIN_DIR) && \
> ? ? ? ?cd $(NPPLUGIN_DIR) && \
> ? ? ? ?$(CXX) $(CXXFLAGS) \
> + ? ? ? ? -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
> ? ? ? ? ?-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
> ? ? ? ? ?-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
> ? ? ? ? ?$(GLIB_CFLAGS) \
> diff -r f4d6e5d2be10 -r 728d7fbb5008 plugin/icedteanp/IcedTeaNPPlugin.cc
> --- a/plugin/icedteanp/IcedTeaNPPlugin.cc ? ? ? Wed Feb 24 16:34:02 2010 +0100
> +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc ? ? ? Thu Feb 25 22:58:15 2010 -0500
> @@ -107,7 +107,7 @@ exception statement from your version. *
> ? "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-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":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;" ? ? ? ? ? \
> @@ -123,7 +123,7 @@ exception statement from your version. *
> ? "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;" ? ?\
> + ?"application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" ? ?\
> ? "application/x-java-vm-npruntime::IcedTea;"
>
> ?#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
> @@ -1575,13 +1575,40 @@ plugin_create_applet_tag (int16_t argc,
> ? ? ? ? ? // characters will pass through the pipe.
> ? ? ? ? ? if (argv[i] != '\0')
> ? ? ? ? ? ? {
> - ? ? ? ? ? ? ?gchar* escaped = NULL;
> + ? ? ? ? ? ? ?// worst case scenario -> all characters are newlines or
> + ? ? ? ? ? ? ?// returns, each of which translates to 5 substitutions
> + ? ? ? ? ? ? ?char* escaped = (char*) calloc(((strlen(argv[i])*5)+1), sizeof(char));
>
> - ? ? ? ? ? ? ?escaped = g_strescape (argv[i], NULL);
> + ? ? ? ? ? ? ?strcpy(escaped, "");
> + ? ? ? ? ? ? ?for (int j=0; j < strlen(argv[i]); j++)
> + ? ? ? ? ? ? ?{
> + ? ? ? ? ? ? ? ? ?if (argv[i][j] == '\r')
> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&#13;");
> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '\n')
> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&#10;");
> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '>')
> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&gt;");
> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '<')
> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&lt;");
> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '&')
> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&amp;");
> + ? ? ? ? ? ? ? ? ?else
> + ? ? ? ? ? ? ? ? ?{
> + ? ? ? ? ? ? ? ? ? ? ?char* orig_char = (char*) calloc(2, sizeof(char));
> + ? ? ? ? ? ? ? ? ? ? ?orig_char[0] = argv[i][j];
> + ? ? ? ? ? ? ? ? ? ? ?orig_char[1] = '\0';
> +
> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, orig_char);
> +
> + ? ? ? ? ? ? ? ? ? ? ?free(orig_char);
> + ? ? ? ? ? ? ? ? ? ? ?orig_char = NULL;
> + ? ? ? ? ? ? ? ? ?}
> + ? ? ? ? ? ? ?}
> +
> ? ? ? ? ? ? ? parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn[i],
> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? "\" VALUE=\"", escaped, "\">", NULL);
>
> - ? ? ? ? ? ? ?g_free (escaped);
> + ? ? ? ? ? ? ?free (escaped);
> ? ? ? ? ? ? ? escaped = NULL;
> ? ? ? ? ? ? }
> ? ? ? ? }
> diff -r f4d6e5d2be10 -r 728d7fbb5008 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Wed Feb 24 16:34:02 2010 +0100
> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Thu Feb 25 22:58:15 2010 -0500
> @@ -91,6 +91,7 @@ import java.net.URI;
> ?import java.net.URI;
> ?import java.net.URL;
> ?import java.security.AccessController;
> +import java.security.AllPermission;
> ?import java.security.PrivilegedAction;
> ?import java.util.Enumeration;
> ?import java.util.HashMap;
> @@ -114,18 +115,199 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? * Lets us construct one using unix-style one shot behaviors
> ? */
>
> - class PluginAppletViewerFactory
> + class PluginAppletPanelFactory
> ?{
> - ? ? public PluginAppletViewer createAppletViewer(int identifier,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?long handle, int x, int y,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?URL doc, Hashtable atts) {
> - ? ? ? ? PluginAppletViewer pluginappletviewer = new PluginAppletViewer(identifier, handle, x, y, doc, atts, System.out, this);
> - ? ? ? ? return pluginappletviewer;
> +
> + ? ? public AppletPanel createPanel(PluginStreamHandler streamhandler,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int identifier,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?long handle, int x, int y,
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?final URL doc, final Hashtable atts) {
> +
> + ? ? ? ? AppletViewerPanel panel = (AppletViewerPanel) AccessController.doPrivileged(new PrivilegedAction() {
> + ? ? ? ? ? ? public Object run() {
> + ? ? ? ? ? ? ? ? ? ?try {
> + ? ? ? ? ? ? ? ? ? ? ? ?AppletPanel panel = new NetxPanel(doc, atts, false);
> + ? ? ? ? ? ? ? ? ? ? ? ?AppletViewerPanel.debug("Using NetX panel");
> + ? ? ? ? ? ? ? ? ? ? ? ?PluginDebug.debug(atts.toString());
> + ? ? ? ? ? ? ? ? ? ? ? ?return panel;
> + ? ? ? ? ? ? ? ? ? ?} catch (Exception ex) {
> + ? ? ? ? ? ? ? ? ? ? ? ?AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
> + ? ? ? ? ? ? ? ? ? ? ? ?return new AppletViewerPanel(doc, atts);
> + ? ? ? ? ? ? ? ? ? ?}
> + ? ? ? ? ? ? }
> + ? ? ? ? });
> +
> + ? ? ? ? double heightFactor = 1.0;
> + ? ? ? ? double widthFactor = 1.0;
> +
> + ? ? ? ? if (atts.get("heightPercentage") != null) {
> + ? ? ? ? ? ? heightFactor = (Integer) atts.get("heightPercentage")/100.0;
> + ? ? ? ? }
> +
> + ? ? ? ? if (atts.get("widthPercentage") != null) {
> + ? ? ? ? ? ? widthFactor = (Integer) atts.get("widthPercentage")/100.0;
> + ? ? ? ? }
> +
> +
> + ? ? ? ? // put inside initial 0 handle frame
> + ? ? ? ? PluginAppletViewer.reFrame(null, identifier, System.out,
> + ? ? ? ? ? ? ? ? heightFactor, widthFactor, 0, panel);
> +
> + ? ? ? ? panel.init();
> +
> + ? ? ? ? // Start the applet
> + ? ? ? ? initEventQueue(panel);
> +
> + ? ? ? ? // Applet initialized. Find out it's classloader and add it to the list
> + ? ? ? ? String portComponent = doc.getPort() != -1 ? ":" + doc.getPort() : "";
> + ? ? ? ? String codeBase = doc.getProtocol() + "://" + doc.getHost() + portComponent;
> +
> + ? ? ? ? if (atts.get("codebase") != null) {
> + ? ? ? ? ? ? try {
> + ? ? ? ? ? ? ? ? URL appletSrcURL = new URL(codeBase + (String) atts.get("codebase"));
> + ? ? ? ? ? ? ? ? codeBase = appletSrcURL.getProtocol() + "://" + appletSrcURL.getHost();
> + ? ? ? ? ? ? } catch (MalformedURLException mfue) {
> + ? ? ? ? ? ? ? ? // do nothing
> + ? ? ? ? ? ? }
> + ? ? ? ? }
> +
> +
> + ? ? ? ? // Wait for the panel to initialize
> + ? ? ? ? // (happens in a separate thread)
> + ? ? ? ? Applet a;
> +
> + ? ? ? ? // Wait for panel to come alive
> + ? ? ? ? int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
> + ? ? ? ? int wait = 0;
> + ? ? ? ? while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
> + ? ? ? ? ? ? ?try {
> + ? ? ? ? ? ? ? ? ?Thread.sleep(50);
> + ? ? ? ? ? ? ? ? ?wait += 50;
> + ? ? ? ? ? ? ?} catch (InterruptedException ie) {
> + ? ? ? ? ? ? ? ? ?ie.printStackTrace();
> + ? ? ? ? ? ? ?}
> + ? ? ? ? }
> +
> + ? ? ? ? // Wait for the panel to initialize
> + ? ? ? ? // (happens in a separate thread)
> + ? ? ? ? while (panel.getApplet() == null &&
> + ? ? ? ? ? ? ? ?((NetxPanel) panel).isAlive()) {
> + ? ? ? ? ? ? try {
> + ? ? ? ? ? ? ? ? Thread.sleep(50);
> + ? ? ? ? ? ? ? ? PluginDebug.debug("Waiting for applet to initialize...");
> + ? ? ? ? ? ? } catch (InterruptedException ie) {
> + ? ? ? ? ? ? ? ? ie.printStackTrace();
> + ? ? ? ? ? ? }
> + ? ? ? ? }
> +
> + ? ? ? ? a = panel.getApplet();
> +
> + ? ? ? ? // Still null?
> + ? ? ? ? if (panel.getApplet() == null) {
> + ? ? ? ? ? ? streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
> + ? ? ? ? ? ? return null;
> + ? ? ? ? }
> +
> + ? ? ? ? PluginDebug.debug("Applet " + a.getClass() + " initialized");
> + ? ? ? ? streamhandler.write("instance " + identifier + " initialized");
> +
> + ? ? ? ? AppletSecurityContextManager.getSecurityContext(0).associateSrc(((NetxPanel) panel).getAppletClassLoader(), doc);
> + ? ? ? ? AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, ((NetxPanel) panel).getAppletClassLoader());
> +
> + ? ? ? ? return panel;
> ? ? ?}
>
> ? ? ?public boolean isStandalone()
> ? ? ?{
> ? ? ? ? ?return false;
> + ? ? }
> +
> + ? ? /**
> + ? ? ?* Send the initial set of events to the appletviewer event queue.
> + ? ? ?* On start-up the current behaviour is to load the applet and call
> + ? ? ?* Applet.init() and Applet.start().
> + ? ? ?*/
> + ? ? private void initEventQueue(AppletPanel panel) {
> + ? ? ? ? // appletviewer.send.event is an undocumented and unsupported system
> + ? ? ? ? // property which is used exclusively for testing purposes.
> + ? ? ? ? PrivilegedAction pa = new PrivilegedAction() {
> + ? ? ? ? ? ? public Object run() {
> + ? ? ? ? ? ? ? ? return System.getProperty("appletviewer.send.event");
> + ? ? ? ? ? ? }
> + ? ? ? ? };
> + ? ? ? ? String eventList = (String) AccessController.doPrivileged(pa);
> +
> + ? ? ? ? if (eventList == null) {
> + ? ? ? ? ? ? // Add the standard events onto the event queue.
> + ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_LOAD);
> + ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_INIT);
> + ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_START);
> + ? ? ? ? } else {
> + ? ? ? ? ? ? // We're testing AppletViewer. ?Force the specified set of events
> + ? ? ? ? ? ? // onto the event queue, wait for the events to be processed, and
> + ? ? ? ? ? ? // exit.
> +
> + ? ? ? ? ? ? // The list of events that will be executed is provided as a
> + ? ? ? ? ? ? // ","-separated list. ?No error-checking will be done on the list.
> + ? ? ? ? ? ? String [] events = splitSeparator(",", eventList);
> +
> + ? ? ? ? ? ? for (int i = 0; i < events.length; i++) {
> + ? ? ? ? ? ? ? ? PluginDebug.debug("Adding event to queue: " + events[i]);
> + ? ? ? ? ? ? ? ? if (events[i].equals("dispose"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_DISPOSE);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("load"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_LOAD);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("init"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_INIT);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("start"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_START);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("stop"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_STOP);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("destroy"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_DESTROY);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("quit"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_QUIT);
> + ? ? ? ? ? ? ? ? else if (events[i].equals("error"))
> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_ERROR);
> + ? ? ? ? ? ? ? ? else
> + ? ? ? ? ? ? ? ? ? ? // non-fatal error if we get an unrecognized event
> + ? ? ? ? ? ? ? ? ? ? PluginDebug.debug("Unrecognized event name: " + events[i]);
> + ? ? ? ? ? ? }
> +
> + ? ? ? ? ? ? while (!panel.emptyEventQueue()) ;
> + ? ? ? ? }
> + ? ? }
> +
> +
> + ? ? /**
> + ? ? ?* Split a string based on the presence of a specified separator. ?Returns
> + ? ? ?* an array of arbitrary length. ?The end of each element in the array is
> + ? ? ?* indicated by the separator of the end of the string. ?If there is a
> + ? ? ?* separator immediately before the end of the string, the final element
> + ? ? ?* will be empty. ?None of the strings will contain the separator. ?Useful
> + ? ? ?* when separating strings such as "foo/bar/bas" using separator "/".
> + ? ? ?*
> + ? ? ?* @param sep ?The separator.
> + ? ? ?* @param s ? ?The string to split.
> + ? ? ?* @return ? ? An array of strings. ?Each string in the array is determined
> + ? ? ?* ? ? ? ? ? ? by the location of the provided sep in the original string,
> + ? ? ?* ? ? ? ? ? ? s. ?Whitespace not stripped.
> + ? ? ?*/
> + ? ? private String [] splitSeparator(String sep, String s) {
> + ? ? ? ? Vector v = new Vector();
> + ? ? ? ? int tokenStart = 0;
> + ? ? ? ? int tokenEnd ? = 0;
> +
> + ? ? ? ? while ((tokenEnd = s.indexOf(sep, tokenStart)) != -1) {
> + ? ? ? ? ? ? v.addElement(s.substring(tokenStart, tokenEnd));
> + ? ? ? ? ? ? tokenStart = tokenEnd+1;
> + ? ? ? ? }
> + ? ? ? ? // Add the final element.
> + ? ? ? ? v.addElement(s.substring(tokenStart));
> +
> + ? ? ? ? String [] retVal = new String[v.size()];
> + ? ? ? ? v.copyInto(retVal);
> + ? ? ? ? return retVal;
> ? ? ?}
> ?}
>
> @@ -146,7 +328,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ? */
> ? ? ?private static String defaultSaveFile = "Applet.ser";
>
> - ? ? private static enum PAV_INIT_STATUS {PRE_INIT, ACTIVE, INACTIVE};
> + ? ? private static enum PAV_INIT_STATUS {PRE_INIT, IN_INIT, INIT_COMPLETE, INACTIVE};
>
> ? ? ?/**
> ? ? ? * The panel in which the applet is being displayed.
> @@ -163,11 +345,6 @@ import com.sun.jndi.toolkit.url.UrlUtil;
> ? ? ? */
>
> ? ? ?PrintStream statusMsgStream;
> -
> - ? ? /**
> - ? ? ?* For cloning
> - ? ? ?*/
> - ? ? PluginAppletViewerFactory factory;
>
> ? ? ?int identifier;
>
> @@ -187,204 +364,155 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>
> ? ? ?private double proposedHeightFactor;
> ? ? ?private double proposedWidthFactor;
> +
> + ? ? private long handle = 0;
> + ? ? private WindowListener windowEventListener = null;
> + ? ? private AppletEventListener appletEventListener = null;
> +
> + ? ? public static final int APPLET_TIMEOUT = 60000;
>
> ? ? ?/**
> ? ? ? * Null constructor to allow instantiation via newInstance()
> ? ? ? */
> ? ? ?public PluginAppletViewer() {
> ? ? ?}
> -
> - ? ? /**
> - ? ? ?* Create the applet viewer
> - ? ? ?*/
> - ? ? public PluginAppletViewer(final int identifier, long handle, int x, int y, final URL doc,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? final Hashtable atts, PrintStream statusMsgStream,
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? PluginAppletViewerFactory factory) {
> - ? ? ? ? super(handle, true);
> - ? ? ? this.factory = factory;
> - ? ? ? this.statusMsgStream = statusMsgStream;
> - ? ? ? ? this.identifier = identifier;
> - ? ? ? ? // FIXME: when/where do we remove this?
> - ? ? ? ? PluginDebug.debug ("PARSING: PUTTING " + identifier + " " + this);
> - ? ? ? ? applets.put(identifier, this);
> +
> + ? ? public static void reFrame(PluginAppletViewer oldFrame,
> + ? ? ? ? ? ? ? ? ? ? ? ? int identifier, PrintStream statusMsgStream,
> + ? ? ? ? ? ? ? ? ? ? ? ? double heightFactor, double widthFactor, long handle,
> + ? ? ? ? ? ? ? ? ? ? ? ? AppletViewerPanel panel) {
> +
> + ? ? ? ? PluginDebug.debug("Reframing " + panel);
>
> -
> - ? ? ? ? // we intercept height and width specifications here because
> - ? ? ? ? proposedHeightFactor = 1.0;
> - ? ? ? ? proposedWidthFactor = 1.0;
> + ? ? ? ? // SecurityManager MUST be set, and only privileged code may call reFrame()
> + ? ? ? ? System.getSecurityManager().checkPermission(new AllPermission());
>
> - ? ? ? ? if (atts.get("heightPercentage") != null) {
> - ? ? ? ? ? ? ? ?proposedHeightFactor = (Integer) atts.get("heightPercentage")/100.0;
> + ? ? ? ? // Same handle => nothing to do
> + ? ? ? ? if (oldFrame != null && handle == oldFrame.handle)
> + ? ? ? ? ? ? return;
> +
> + ? ? ? ? PluginAppletViewer newFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, heightFactor, widthFactor);
> + ? ? ? ? newFrame.panel = panel;
> +
> + ? ? ? ? if (oldFrame != null) {
> + ? ? ? ? ? ? applets.remove(oldFrame.identifier);
> + ? ? ? ? ? ? oldFrame.removeWindowListener(oldFrame.windowEventListener);
> + ? ? ? ? ? ? panel.removeAppletListener(oldFrame.appletEventListener);
> + ? ? ? ? ? ? oldFrame.remove(panel);
> + ? ? ? ? ? ? oldFrame.dispose();
> + ? ? ? ? }
> +
> + ? ? ? ? newFrame.add("Center", panel);
> + ? ? ? ? newFrame.pack();
> +
> + ? ? ? ? newFrame.appletEventListener = new AppletEventListener(newFrame, newFrame);
> + ? ? ? ? panel.addAppletListener(newFrame.appletEventListener);
> +
> + ? ? ? ? applets.put(identifier, newFrame);
> +
> + ? ? ? ? // dispose oldframe if necessary
> + ? ? ? ? if (oldFrame != null) {
> + ? ? ? ? ? ? oldFrame.dispose();
> ? ? ? ? ?}
>
> - ? ? ? ? if (atts.get("widthPercentage") != null) {
> - ? ? ? ? ? ? ? ?proposedWidthFactor = (Integer) atts.get("widthPercentage")/100.0;
> + ? ? ? ? PluginDebug.debug(panel + " reframed");
> + ? ? }
> +
> + ? ? /**
> + ? ? ?* Create new plugin appletviewer frame
> + ? ? ?*/
> + ? ? private PluginAppletViewer(long handle, final int identifier,
> + ? ? ? ? ? ? ? ? ? ? ? ? PrintStream statusMsgStream, double heightFactor,
> + ? ? ? ? ? ? ? ? ? ? ? ? double widthFactor) {
> +
> + ? ? ? ? super(handle, true);
> + ? ? ? ? this.statusMsgStream = statusMsgStream;
> + ? ? ? ? this.identifier = identifier;
> + ? ? ? ? this.proposedHeightFactor = heightFactor;
> + ? ? ? ? this.proposedWidthFactor = widthFactor;
> +
> + ? ? ? ? if (!appletPanels.contains(panel))
> + ? ? ? ? ? ? appletPanels.addElement(panel);
> +
> + ? ? ? ? windowEventListener = new WindowAdapter() {
> +
> + ? ? ? ? ? ? public void windowClosing(WindowEvent evt) {
> + ? ? ? ? ? ? ? ? appletClose();
> + ? ? ? ? ? ? }
> +
> + ? ? ? ? ? ? public void windowIconified(WindowEvent evt) {
> + ? ? ? ? ? ? ? ? appletStop();
> + ? ? ? ? ? ? }
> +
> + ? ? ? ? ? ? public void windowDeiconified(WindowEvent evt) {
> + ? ? ? ? ? ? ? ? appletStart();
> + ? ? ? ? ? ? }
> + ? ? ? ? };
> +
> + ? ? ? ? addWindowListener(windowEventListener);
> +
> + ? ? }
> +
> + ? ? private static class AppletEventListener implements AppletListener
> + ? ? {
> + ? ? ? ? final Frame frame;
> + ? ? ? ? final PluginAppletViewer appletViewer;
> +
> + ? ? ? ? public AppletEventListener(Frame frame, PluginAppletViewer appletViewer)
> + ? ? ? ? {
> + ? ? ? ? this.frame = frame;
> + ? ? ? ? this.appletViewer = appletViewer;
> ? ? ? ? ?}
> -
> - ? ? ? ? AccessController.doPrivileged(new PrivilegedAction() {
> - ? ? ? ? ? ? public Object run() {
> - ? ? ? ? ? ? ? ? ? ? ? try {
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? panel = new NetxPanel(doc, atts, false);
> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 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);
> - ? ? ? ? ? ? ? ? ? ? ? }
> - ? ? ? ? ? ? ? ? return null;
> +
> + ? ? ? ? public void appletStateChanged(AppletEvent evt)
>

Thanks for doing this, though it shouldn't be necessary to alter the
changesets when importing (other than ChangeLog merging).
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 linuxhippy at gmail.com  Fri Feb 26 05:54:36 2010
From: linuxhippy at gmail.com (Clemens Eisserer)
Date: Fri, 26 Feb 2010 08:54:36 -0500
Subject: Howto create redistributable packages?
Message-ID: <194f62551002260554g159b35d7t5def50619650d977@mail.gmail.com>

Hi,

I would like to build redistributable OpenJDK packages, to allow
easier testing of my xrender java2d pipeline.
For now the linux-i586 dir differs quite a bit, compared to Sun's
tarballs (e.g. no rt.jar, but classes unzipped),
is there a way to create sun-like packages?

Furthermore I guess I may not call it OpenJDK, is there a simple way
to rename it, or it it sufficient to offer it under a different name?

Thank you in advance, Clemens


From xerxes at zafena.se  Fri Feb 26 06:03:10 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 26 Feb 2010 15:03:10 +0100
Subject: RFInclusion into Icedtea6 1.7.1 release branch Shark API fixes for
	llvm 2.7 and Zero syncronization with upstream and zero S390 fixes
Message-ID: <4B87D49E.1060401@zafena.se>

A list of changesets from Icedtea6 that i would like to have included in
Icedtea6 1.7.1 releasebranch for improved Shark API compatiblity with
LLVM 2.7, Zero upstream sync and zero S390 fixes.

http://icedtea.classpath.org/hg/icedtea6/rev/2b86a59d4446 - Whitespace
fixes
http://icedtea.classpath.org/hg/icedtea6/rev/a9569f1ff015 - Reformat
Shark to match upstream HotSpot
http://icedtea.classpath.org/hg/icedtea6/rev/9748785082e5 - Add 2010 to
some copyright headers that were missing it
http://icedtea.classpath.org/hg/icedtea6/rev/fee30f40652c -
ports/hotspot/make/linux/makefiles/shark.make: Comment fix.

http://icedtea.classpath.org/hg/icedtea6/rev/6571641c60ab - Update Shark
for LLVM r95390 API change.
http://icedtea.classpath.org/hg/icedtea6/rev/a508d7cd967a - Backport
"6927165: Zero S/390 fixes" from upstream
http://icedtea.classpath.org/hg/icedtea6/rev/6dccdd4c25c7 - Implemented
Shark host CPU feature autotuner using LLVM 2.7 APIs.
http://icedtea.classpath.org/hg/icedtea6/rev/8eb821cc2cd0 - Add s390
support to TCK setup helper script
http://icedtea.classpath.org/hg/icedtea6/rev/c4148e0a2984 - Synchronize
Zero with upstream
http://icedtea.classpath.org/hg/icedtea6/rev/fc600c234771 - Strip stupid
options that llvm-config supplies
http://icedtea.classpath.org/hg/icedtea6/rev/22be2c99a89b - Update Shark
for LLVM r94686 API change.
http://icedtea.classpath.org/hg/icedtea6/rev/d9e57470d35d - PR
icedtea/428: Remove -pedantic from LLVM_CFLAGS. (required for Strip
stupid options that llvm-config supplies)

Ok to merge?

Cheers
Xerxes


From gnu_andrew at member.fsf.org  Fri Feb 26 06:07:00 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 14:07:00 +0000
Subject: /hg/release/icedtea6-1.7: 6 new changesets
In-Reply-To: <17c6771e1002260437i1a34a913n3b5380eaca4a0bc3@mail.gmail.com>
References: <hg.6e4b712d16b6.1267156748.1785565629229908553@icedtea.classpath.org>
	<17c6771e1002260437i1a34a913n3b5380eaca4a0bc3@mail.gmail.com>
Message-ID: <17c6771e1002260607q7826731cid74c818ba190ca33@mail.gmail.com>

On 26 February 2010 12:37, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
> On 26 February 2010 03:59, ?<dbhole at icedtea.classpath.org> wrote:
>> changeset 6e4b712d16b6 in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6e4b712d16b6
>> author: Deepak Bhole <dbhole at redhat.com>
>> date: Thu Feb 25 22:41:59 2010 -0500
>>
>> ? ? ? ?- Import from main line
>>
>> ? ? ? ?- Re-designed frame embedding code so that the applet is dynamically
>> ? ? ? ?packed into given handle. This increases stability and breaks
>> ? ? ? ?reliance on the assumption that the browser will always provide a
>> ? ? ? ?handle in a certain sequence.
>>
>>
>> changeset e1aa8a1748cb in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e1aa8a1748cb
>> author: Deepak Bhole <dbhole at redhat.com>
>> date: Thu Feb 25 22:43:56 2010 -0500
>>
>> ? ? ? ?- Import from main line
>> ? ? ? ?- Added tests for JSObject.eval()
>>
>>
>> changeset 969ccd883d23 in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=969ccd883d23
>> author: Deepak Bhole <dbhole at redhat.com>
>> date: Thu Feb 25 22:45:36 2010 -0500
>>
>> ? ? ? ?- Import from main line
>>
>> ? ? ? ?- Encode new lines, carriage returns, and other special characters
>> ? ? ? ?before sending them to Java side (de-coding code is already in
>> ? ? ? ?effect on Java side).
>>
>>
>> changeset cad2a2d3f4cd in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=cad2a2d3f4cd
>> author: Deepak Bhole <dbhole at redhat.com>
>> date: Thu Feb 25 22:55:12 2010 -0500
>>
>> ? ? ? ?- Import from main line
>>
>> ? ? ? ?- Centralized and increased timeouts to give slow-loading applets
>> ? ? ? ?enough time to load.
>>
>>
>> changeset 58b42ff925ea in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=58b42ff925ea
>> author: Deepak Bhole <dbhole at redhat.com>
>> date: Thu Feb 25 22:56:45 2010 -0500
>>
>> ? ? ? ?- Import from main line
>>
>> ? ? ? ?- Fixed IcedTea Bug# 446: Use JDK_UPDATE_VERSION to set the jpi
>> ? ? ? ?version.
>>
>>
>> changeset 728d7fbb5008 in /hg/release/icedtea6-1.7
>> details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=728d7fbb5008
>> author: Deepak Bhole <dbhole at redhat.com>
>> date: Thu Feb 25 22:58:15 2010 -0500
>>
>> ? ? ? ?- Import from main line
>>
>> ? ? ? ?- Fix security permissions related to get/set property, based on
>> ? ? ? ?specifications
>>
>> ? ? ? ?* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some
>> ? ? ? ?javaplugin.* properties that some applets expect.
>> ? ? ? ?* rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
>> ? ? ? ?allowed property get/set based on specifications.
>>
>>
>> diffstat:
>>
>> 10 files changed, 1184 insertions(+), 933 deletions(-)
>> ChangeLog ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? 40
>> Makefile.am ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1
>> plugin/icedteanp/IcedTeaNPPlugin.cc ? ? ? ? ? ? ? ? ? ? ?| ? 37
>> plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 1874 +++++++-------
>> plugin/icedteanp/java/sun/applet/PluginMain.java ? ? ? ? | ? ?4
>> plugin/tests/LiveConnect/PluginTest.java ? ? ? ? ? ? ? ? | ? 11
>> plugin/tests/LiveConnect/common.js ? ? ? ? ? ? ? ? ? ? ? | ? ?3
>> plugin/tests/LiveConnect/index.html ? ? ? ? ? ? ? ? ? ? ?| ? ?2
>> plugin/tests/LiveConnect/jjs_eval_test.js ? ? ? ? ? ? ? ?| ? 57
>> rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java | ? 88
>>
>> diffs (truncated from 2742 to 500 lines):
>>
>> diff -r f4d6e5d2be10 -r 728d7fbb5008 ChangeLog
>> --- a/ChangeLog Wed Feb 24 16:34:02 2010 +0100
>> +++ b/ChangeLog Thu Feb 25 22:58:15 2010 -0500
>> @@ -1,3 +1,43 @@ 2010-02-24 Pavel Tisnovsky ?<ptisnovs at re
>> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
>> +
>> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
>> + ? ? ? properties that some applets expect.
>> + ? ? ? * rt/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java: Implement
>> + ? ? ? allowed property get/set based on specifications.
>> +
>> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
>> +
>> + ? ? ? * Makefile.am: Provide JDK_UPDATE_VERSION when compiling the plugin
>> + ? ? ? * plugin/icedteanp/IcedTeaNPPlugin.cc: Use JDK_UPDATE_VERSION to set the
>> + ? ? ? jpi version.
>> +
>> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
>> +
>> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Centralized
>> + ? ? ? and increased timeouts to give slow-loading applets enough time to load.
>> +
>> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
>> +
>> + ? ? ? * plugin/icedteanp/IcedTeaNPPlugin.cc
>> + ? ? ? (plugin_create_applet_tag): Encode new lines, carriage returns, and
>> + ? ? ? other special characters before sending them to Java side (de-coding
>> + ? ? ? code is already in effect on Java side).
>> +
>> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
>> +
>> + ? ? ? * plugin/tests/LiveConnect/PluginTest.java
>> + ? ? ? (jjsEvalTest): New function. Calls JSObject.eval() with given string.
>> + ? ? ? * plugin/tests/LiveConnect/common.js: Added eval test suite as one of the
>> + ? ? ? run options.
>> + ? ? ? * plugin/tests/LiveConnect/index.html: Same.
>> + ? ? ? * plugin/tests/LiveConnect/jjs_eval_test.js: Eval tests.
>> +
>> +2010-02-25 ?Deepak Bhole <dbhole at redhat.com>
>> +
>> + ? ? ? * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: Re-designed
>> + ? ? ? frame embedding code so that the applet is dynamically packed into given
>> + ? ? ? handle.
>> +
>> ?2010-02-24 Pavel Tisnovsky ?<ptisnovs at redhat.com>
>> ? ? ? ?* Makefile.am: Corrected Pulse Audio
>> ? ? ? ?library build
>> diff -r f4d6e5d2be10 -r 728d7fbb5008 Makefile.am
>> --- a/Makefile.am ? ? ? Wed Feb 24 16:34:02 2010 +0100
>> +++ b/Makefile.am ? ? ? Thu Feb 25 22:58:15 2010 -0500
>> @@ -1499,6 +1499,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
>> ? ? ? ?mkdir -p $(NPPLUGIN_DIR) && \
>> ? ? ? ?cd $(NPPLUGIN_DIR) && \
>> ? ? ? ?$(CXX) $(CXXFLAGS) \
>> + ? ? ? ? -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
>> ? ? ? ? ?-DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
>> ? ? ? ? ?-DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
>> ? ? ? ? ?$(GLIB_CFLAGS) \
>> diff -r f4d6e5d2be10 -r 728d7fbb5008 plugin/icedteanp/IcedTeaNPPlugin.cc
>> --- a/plugin/icedteanp/IcedTeaNPPlugin.cc ? ? ? Wed Feb 24 16:34:02 2010 +0100
>> +++ b/plugin/icedteanp/IcedTeaNPPlugin.cc ? ? ? Thu Feb 25 22:58:15 2010 -0500
>> @@ -107,7 +107,7 @@ exception statement from your version. *
>> ? "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-applet;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":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;" ? ? ? ? ? \
>> @@ -123,7 +123,7 @@ exception statement from your version. *
>> ? "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;" ? ?\
>> + ?"application/x-java-bean;jpi-version=1.6.0_" JDK_UPDATE_VERSION ":class,jar:IcedTea;" ? ?\
>> ? "application/x-java-vm-npruntime::IcedTea;"
>>
>> ?#define PLUGIN_URL NS_INLINE_PLUGIN_CONTRACTID_PREFIX NS_JVM_MIME_TYPE
>> @@ -1575,13 +1575,40 @@ plugin_create_applet_tag (int16_t argc,
>> ? ? ? ? ? // characters will pass through the pipe.
>> ? ? ? ? ? if (argv[i] != '\0')
>> ? ? ? ? ? ? {
>> - ? ? ? ? ? ? ?gchar* escaped = NULL;
>> + ? ? ? ? ? ? ?// worst case scenario -> all characters are newlines or
>> + ? ? ? ? ? ? ?// returns, each of which translates to 5 substitutions
>> + ? ? ? ? ? ? ?char* escaped = (char*) calloc(((strlen(argv[i])*5)+1), sizeof(char));
>>
>> - ? ? ? ? ? ? ?escaped = g_strescape (argv[i], NULL);
>> + ? ? ? ? ? ? ?strcpy(escaped, "");
>> + ? ? ? ? ? ? ?for (int j=0; j < strlen(argv[i]); j++)
>> + ? ? ? ? ? ? ?{
>> + ? ? ? ? ? ? ? ? ?if (argv[i][j] == '\r')
>> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&#13;");
>> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '\n')
>> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&#10;");
>> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '>')
>> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&gt;");
>> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '<')
>> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&lt;");
>> + ? ? ? ? ? ? ? ? ?else if (argv[i][j] == '&')
>> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, "&amp;");
>> + ? ? ? ? ? ? ? ? ?else
>> + ? ? ? ? ? ? ? ? ?{
>> + ? ? ? ? ? ? ? ? ? ? ?char* orig_char = (char*) calloc(2, sizeof(char));
>> + ? ? ? ? ? ? ? ? ? ? ?orig_char[0] = argv[i][j];
>> + ? ? ? ? ? ? ? ? ? ? ?orig_char[1] = '\0';
>> +
>> + ? ? ? ? ? ? ? ? ? ? ?strcat(escaped, orig_char);
>> +
>> + ? ? ? ? ? ? ? ? ? ? ?free(orig_char);
>> + ? ? ? ? ? ? ? ? ? ? ?orig_char = NULL;
>> + ? ? ? ? ? ? ? ? ?}
>> + ? ? ? ? ? ? ?}
>> +
>> ? ? ? ? ? ? ? parameters = g_strconcat (parameters, "<PARAM NAME=\"", argn[i],
>> ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? "\" VALUE=\"", escaped, "\">", NULL);
>>
>> - ? ? ? ? ? ? ?g_free (escaped);
>> + ? ? ? ? ? ? ?free (escaped);
>> ? ? ? ? ? ? ? escaped = NULL;
>> ? ? ? ? ? ? }
>> ? ? ? ? }
>> diff -r f4d6e5d2be10 -r 728d7fbb5008 plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
>> --- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Wed Feb 24 16:34:02 2010 +0100
>> +++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java ?Thu Feb 25 22:58:15 2010 -0500
>> @@ -91,6 +91,7 @@ import java.net.URI;
>> ?import java.net.URI;
>> ?import java.net.URL;
>> ?import java.security.AccessController;
>> +import java.security.AllPermission;
>> ?import java.security.PrivilegedAction;
>> ?import java.util.Enumeration;
>> ?import java.util.HashMap;
>> @@ -114,18 +115,199 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> ? * Lets us construct one using unix-style one shot behaviors
>> ? */
>>
>> - class PluginAppletViewerFactory
>> + class PluginAppletPanelFactory
>> ?{
>> - ? ? public PluginAppletViewer createAppletViewer(int identifier,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?long handle, int x, int y,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?URL doc, Hashtable atts) {
>> - ? ? ? ? PluginAppletViewer pluginappletviewer = new PluginAppletViewer(identifier, handle, x, y, doc, atts, System.out, this);
>> - ? ? ? ? return pluginappletviewer;
>> +
>> + ? ? public AppletPanel createPanel(PluginStreamHandler streamhandler,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?int identifier,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?long handle, int x, int y,
>> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?final URL doc, final Hashtable atts) {
>> +
>> + ? ? ? ? AppletViewerPanel panel = (AppletViewerPanel) AccessController.doPrivileged(new PrivilegedAction() {
>> + ? ? ? ? ? ? public Object run() {
>> + ? ? ? ? ? ? ? ? ? ?try {
>> + ? ? ? ? ? ? ? ? ? ? ? ?AppletPanel panel = new NetxPanel(doc, atts, false);
>> + ? ? ? ? ? ? ? ? ? ? ? ?AppletViewerPanel.debug("Using NetX panel");
>> + ? ? ? ? ? ? ? ? ? ? ? ?PluginDebug.debug(atts.toString());
>> + ? ? ? ? ? ? ? ? ? ? ? ?return panel;
>> + ? ? ? ? ? ? ? ? ? ?} catch (Exception ex) {
>> + ? ? ? ? ? ? ? ? ? ? ? ?AppletViewerPanel.debug("Unable to start NetX applet - defaulting to Sun applet", ex);
>> + ? ? ? ? ? ? ? ? ? ? ? ?return new AppletViewerPanel(doc, atts);
>> + ? ? ? ? ? ? ? ? ? ?}
>> + ? ? ? ? ? ? }
>> + ? ? ? ? });
>> +
>> + ? ? ? ? double heightFactor = 1.0;
>> + ? ? ? ? double widthFactor = 1.0;
>> +
>> + ? ? ? ? if (atts.get("heightPercentage") != null) {
>> + ? ? ? ? ? ? heightFactor = (Integer) atts.get("heightPercentage")/100.0;
>> + ? ? ? ? }
>> +
>> + ? ? ? ? if (atts.get("widthPercentage") != null) {
>> + ? ? ? ? ? ? widthFactor = (Integer) atts.get("widthPercentage")/100.0;
>> + ? ? ? ? }
>> +
>> +
>> + ? ? ? ? // put inside initial 0 handle frame
>> + ? ? ? ? PluginAppletViewer.reFrame(null, identifier, System.out,
>> + ? ? ? ? ? ? ? ? heightFactor, widthFactor, 0, panel);
>> +
>> + ? ? ? ? panel.init();
>> +
>> + ? ? ? ? // Start the applet
>> + ? ? ? ? initEventQueue(panel);
>> +
>> + ? ? ? ? // Applet initialized. Find out it's classloader and add it to the list
>> + ? ? ? ? String portComponent = doc.getPort() != -1 ? ":" + doc.getPort() : "";
>> + ? ? ? ? String codeBase = doc.getProtocol() + "://" + doc.getHost() + portComponent;
>> +
>> + ? ? ? ? if (atts.get("codebase") != null) {
>> + ? ? ? ? ? ? try {
>> + ? ? ? ? ? ? ? ? URL appletSrcURL = new URL(codeBase + (String) atts.get("codebase"));
>> + ? ? ? ? ? ? ? ? codeBase = appletSrcURL.getProtocol() + "://" + appletSrcURL.getHost();
>> + ? ? ? ? ? ? } catch (MalformedURLException mfue) {
>> + ? ? ? ? ? ? ? ? // do nothing
>> + ? ? ? ? ? ? }
>> + ? ? ? ? }
>> +
>> +
>> + ? ? ? ? // Wait for the panel to initialize
>> + ? ? ? ? // (happens in a separate thread)
>> + ? ? ? ? Applet a;
>> +
>> + ? ? ? ? // Wait for panel to come alive
>> + ? ? ? ? int maxWait = PluginAppletViewer.APPLET_TIMEOUT; // wait for panel to come alive
>> + ? ? ? ? int wait = 0;
>> + ? ? ? ? while ((panel == null) || (!((NetxPanel) panel).isAlive() && wait < maxWait)) {
>> + ? ? ? ? ? ? ?try {
>> + ? ? ? ? ? ? ? ? ?Thread.sleep(50);
>> + ? ? ? ? ? ? ? ? ?wait += 50;
>> + ? ? ? ? ? ? ?} catch (InterruptedException ie) {
>> + ? ? ? ? ? ? ? ? ?ie.printStackTrace();
>> + ? ? ? ? ? ? ?}
>> + ? ? ? ? }
>> +
>> + ? ? ? ? // Wait for the panel to initialize
>> + ? ? ? ? // (happens in a separate thread)
>> + ? ? ? ? while (panel.getApplet() == null &&
>> + ? ? ? ? ? ? ? ?((NetxPanel) panel).isAlive()) {
>> + ? ? ? ? ? ? try {
>> + ? ? ? ? ? ? ? ? Thread.sleep(50);
>> + ? ? ? ? ? ? ? ? PluginDebug.debug("Waiting for applet to initialize...");
>> + ? ? ? ? ? ? } catch (InterruptedException ie) {
>> + ? ? ? ? ? ? ? ? ie.printStackTrace();
>> + ? ? ? ? ? ? }
>> + ? ? ? ? }
>> +
>> + ? ? ? ? a = panel.getApplet();
>> +
>> + ? ? ? ? // Still null?
>> + ? ? ? ? if (panel.getApplet() == null) {
>> + ? ? ? ? ? ? streamhandler.write("instance " + identifier + " reference " + -1 + " fatalError " + "Initialization failed");
>> + ? ? ? ? ? ? return null;
>> + ? ? ? ? }
>> +
>> + ? ? ? ? PluginDebug.debug("Applet " + a.getClass() + " initialized");
>> + ? ? ? ? streamhandler.write("instance " + identifier + " initialized");
>> +
>> + ? ? ? ? AppletSecurityContextManager.getSecurityContext(0).associateSrc(((NetxPanel) panel).getAppletClassLoader(), doc);
>> + ? ? ? ? AppletSecurityContextManager.getSecurityContext(0).associateInstance(identifier, ((NetxPanel) panel).getAppletClassLoader());
>> +
>> + ? ? ? ? return panel;
>> ? ? ?}
>>
>> ? ? ?public boolean isStandalone()
>> ? ? ?{
>> ? ? ? ? ?return false;
>> + ? ? }
>> +
>> + ? ? /**
>> + ? ? ?* Send the initial set of events to the appletviewer event queue.
>> + ? ? ?* On start-up the current behaviour is to load the applet and call
>> + ? ? ?* Applet.init() and Applet.start().
>> + ? ? ?*/
>> + ? ? private void initEventQueue(AppletPanel panel) {
>> + ? ? ? ? // appletviewer.send.event is an undocumented and unsupported system
>> + ? ? ? ? // property which is used exclusively for testing purposes.
>> + ? ? ? ? PrivilegedAction pa = new PrivilegedAction() {
>> + ? ? ? ? ? ? public Object run() {
>> + ? ? ? ? ? ? ? ? return System.getProperty("appletviewer.send.event");
>> + ? ? ? ? ? ? }
>> + ? ? ? ? };
>> + ? ? ? ? String eventList = (String) AccessController.doPrivileged(pa);
>> +
>> + ? ? ? ? if (eventList == null) {
>> + ? ? ? ? ? ? // Add the standard events onto the event queue.
>> + ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_LOAD);
>> + ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_INIT);
>> + ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_START);
>> + ? ? ? ? } else {
>> + ? ? ? ? ? ? // We're testing AppletViewer. ?Force the specified set of events
>> + ? ? ? ? ? ? // onto the event queue, wait for the events to be processed, and
>> + ? ? ? ? ? ? // exit.
>> +
>> + ? ? ? ? ? ? // The list of events that will be executed is provided as a
>> + ? ? ? ? ? ? // ","-separated list. ?No error-checking will be done on the list.
>> + ? ? ? ? ? ? String [] events = splitSeparator(",", eventList);
>> +
>> + ? ? ? ? ? ? for (int i = 0; i < events.length; i++) {
>> + ? ? ? ? ? ? ? ? PluginDebug.debug("Adding event to queue: " + events[i]);
>> + ? ? ? ? ? ? ? ? if (events[i].equals("dispose"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_DISPOSE);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("load"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_LOAD);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("init"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_INIT);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("start"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_START);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("stop"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_STOP);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("destroy"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_DESTROY);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("quit"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_QUIT);
>> + ? ? ? ? ? ? ? ? else if (events[i].equals("error"))
>> + ? ? ? ? ? ? ? ? ? ? panel.sendEvent(AppletPanel.APPLET_ERROR);
>> + ? ? ? ? ? ? ? ? else
>> + ? ? ? ? ? ? ? ? ? ? // non-fatal error if we get an unrecognized event
>> + ? ? ? ? ? ? ? ? ? ? PluginDebug.debug("Unrecognized event name: " + events[i]);
>> + ? ? ? ? ? ? }
>> +
>> + ? ? ? ? ? ? while (!panel.emptyEventQueue()) ;
>> + ? ? ? ? }
>> + ? ? }
>> +
>> +
>> + ? ? /**
>> + ? ? ?* Split a string based on the presence of a specified separator. ?Returns
>> + ? ? ?* an array of arbitrary length. ?The end of each element in the array is
>> + ? ? ?* indicated by the separator of the end of the string. ?If there is a
>> + ? ? ?* separator immediately before the end of the string, the final element
>> + ? ? ?* will be empty. ?None of the strings will contain the separator. ?Useful
>> + ? ? ?* when separating strings such as "foo/bar/bas" using separator "/".
>> + ? ? ?*
>> + ? ? ?* @param sep ?The separator.
>> + ? ? ?* @param s ? ?The string to split.
>> + ? ? ?* @return ? ? An array of strings. ?Each string in the array is determined
>> + ? ? ?* ? ? ? ? ? ? by the location of the provided sep in the original string,
>> + ? ? ?* ? ? ? ? ? ? s. ?Whitespace not stripped.
>> + ? ? ?*/
>> + ? ? private String [] splitSeparator(String sep, String s) {
>> + ? ? ? ? Vector v = new Vector();
>> + ? ? ? ? int tokenStart = 0;
>> + ? ? ? ? int tokenEnd ? = 0;
>> +
>> + ? ? ? ? while ((tokenEnd = s.indexOf(sep, tokenStart)) != -1) {
>> + ? ? ? ? ? ? v.addElement(s.substring(tokenStart, tokenEnd));
>> + ? ? ? ? ? ? tokenStart = tokenEnd+1;
>> + ? ? ? ? }
>> + ? ? ? ? // Add the final element.
>> + ? ? ? ? v.addElement(s.substring(tokenStart));
>> +
>> + ? ? ? ? String [] retVal = new String[v.size()];
>> + ? ? ? ? v.copyInto(retVal);
>> + ? ? ? ? return retVal;
>> ? ? ?}
>> ?}
>>
>> @@ -146,7 +328,7 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> ? ? ? */
>> ? ? ?private static String defaultSaveFile = "Applet.ser";
>>
>> - ? ? private static enum PAV_INIT_STATUS {PRE_INIT, ACTIVE, INACTIVE};
>> + ? ? private static enum PAV_INIT_STATUS {PRE_INIT, IN_INIT, INIT_COMPLETE, INACTIVE};
>>
>> ? ? ?/**
>> ? ? ? * The panel in which the applet is being displayed.
>> @@ -163,11 +345,6 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>> ? ? ? */
>>
>> ? ? ?PrintStream statusMsgStream;
>> -
>> - ? ? /**
>> - ? ? ?* For cloning
>> - ? ? ?*/
>> - ? ? PluginAppletViewerFactory factory;
>>
>> ? ? ?int identifier;
>>
>> @@ -187,204 +364,155 @@ import com.sun.jndi.toolkit.url.UrlUtil;
>>
>> ? ? ?private double proposedHeightFactor;
>> ? ? ?private double proposedWidthFactor;
>> +
>> + ? ? private long handle = 0;
>> + ? ? private WindowListener windowEventListener = null;
>> + ? ? private AppletEventListener appletEventListener = null;
>> +
>> + ? ? public static final int APPLET_TIMEOUT = 60000;
>>
>> ? ? ?/**
>> ? ? ? * Null constructor to allow instantiation via newInstance()
>> ? ? ? */
>> ? ? ?public PluginAppletViewer() {
>> ? ? ?}
>> -
>> - ? ? /**
>> - ? ? ?* Create the applet viewer
>> - ? ? ?*/
>> - ? ? public PluginAppletViewer(final int identifier, long handle, int x, int y, final URL doc,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? final Hashtable atts, PrintStream statusMsgStream,
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? PluginAppletViewerFactory factory) {
>> - ? ? ? ? super(handle, true);
>> - ? ? ? this.factory = factory;
>> - ? ? ? this.statusMsgStream = statusMsgStream;
>> - ? ? ? ? this.identifier = identifier;
>> - ? ? ? ? // FIXME: when/where do we remove this?
>> - ? ? ? ? PluginDebug.debug ("PARSING: PUTTING " + identifier + " " + this);
>> - ? ? ? ? applets.put(identifier, this);
>> +
>> + ? ? public static void reFrame(PluginAppletViewer oldFrame,
>> + ? ? ? ? ? ? ? ? ? ? ? ? int identifier, PrintStream statusMsgStream,
>> + ? ? ? ? ? ? ? ? ? ? ? ? double heightFactor, double widthFactor, long handle,
>> + ? ? ? ? ? ? ? ? ? ? ? ? AppletViewerPanel panel) {
>> +
>> + ? ? ? ? PluginDebug.debug("Reframing " + panel);
>>
>> -
>> - ? ? ? ? // we intercept height and width specifications here because
>> - ? ? ? ? proposedHeightFactor = 1.0;
>> - ? ? ? ? proposedWidthFactor = 1.0;
>> + ? ? ? ? // SecurityManager MUST be set, and only privileged code may call reFrame()
>> + ? ? ? ? System.getSecurityManager().checkPermission(new AllPermission());
>>
>> - ? ? ? ? if (atts.get("heightPercentage") != null) {
>> - ? ? ? ? ? ? ? ?proposedHeightFactor = (Integer) atts.get("heightPercentage")/100.0;
>> + ? ? ? ? // Same handle => nothing to do
>> + ? ? ? ? if (oldFrame != null && handle == oldFrame.handle)
>> + ? ? ? ? ? ? return;
>> +
>> + ? ? ? ? PluginAppletViewer newFrame = new PluginAppletViewer(handle, identifier, statusMsgStream, heightFactor, widthFactor);
>> + ? ? ? ? newFrame.panel = panel;
>> +
>> + ? ? ? ? if (oldFrame != null) {
>> + ? ? ? ? ? ? applets.remove(oldFrame.identifier);
>> + ? ? ? ? ? ? oldFrame.removeWindowListener(oldFrame.windowEventListener);
>> + ? ? ? ? ? ? panel.removeAppletListener(oldFrame.appletEventListener);
>> + ? ? ? ? ? ? oldFrame.remove(panel);
>> + ? ? ? ? ? ? oldFrame.dispose();
>> + ? ? ? ? }
>> +
>> + ? ? ? ? newFrame.add("Center", panel);
>> + ? ? ? ? newFrame.pack();
>> +
>> + ? ? ? ? newFrame.appletEventListener = new AppletEventListener(newFrame, newFrame);
>> + ? ? ? ? panel.addAppletListener(newFrame.appletEventListener);
>> +
>> + ? ? ? ? applets.put(identifier, newFrame);
>> +
>> + ? ? ? ? // dispose oldframe if necessary
>> + ? ? ? ? if (oldFrame != null) {
>> + ? ? ? ? ? ? oldFrame.dispose();
>> ? ? ? ? ?}
>>
>> - ? ? ? ? if (atts.get("widthPercentage") != null) {
>> - ? ? ? ? ? ? ? ?proposedWidthFactor = (Integer) atts.get("widthPercentage")/100.0;
>> + ? ? ? ? PluginDebug.debug(panel + " reframed");
>> + ? ? }
>> +
>> + ? ? /**
>> + ? ? ?* Create new plugin appletviewer frame
>> + ? ? ?*/
>> + ? ? private PluginAppletViewer(long handle, final int identifier,
>> + ? ? ? ? ? ? ? ? ? ? ? ? PrintStream statusMsgStream, double heightFactor,
>> + ? ? ? ? ? ? ? ? ? ? ? ? double widthFactor) {
>> +
>> + ? ? ? ? super(handle, true);
>> + ? ? ? ? this.statusMsgStream = statusMsgStream;
>> + ? ? ? ? this.identifier = identifier;
>> + ? ? ? ? this.proposedHeightFactor = heightFactor;
>> + ? ? ? ? this.proposedWidthFactor = widthFactor;
>> +
>> + ? ? ? ? if (!appletPanels.contains(panel))
>> + ? ? ? ? ? ? appletPanels.addElement(panel);
>> +
>> + ? ? ? ? windowEventListener = new WindowAdapter() {
>> +
>> + ? ? ? ? ? ? public void windowClosing(WindowEvent evt) {
>> + ? ? ? ? ? ? ? ? appletClose();
>> + ? ? ? ? ? ? }
>> +
>> + ? ? ? ? ? ? public void windowIconified(WindowEvent evt) {
>> + ? ? ? ? ? ? ? ? appletStop();
>> + ? ? ? ? ? ? }
>> +
>> + ? ? ? ? ? ? public void windowDeiconified(WindowEvent evt) {
>> + ? ? ? ? ? ? ? ? appletStart();
>> + ? ? ? ? ? ? }
>> + ? ? ? ? };
>> +
>> + ? ? ? ? addWindowListener(windowEventListener);
>> +
>> + ? ? }
>> +
>> + ? ? private static class AppletEventListener implements AppletListener
>> + ? ? {
>> + ? ? ? ? final Frame frame;
>> + ? ? ? ? final PluginAppletViewer appletViewer;
>> +
>> + ? ? ? ? public AppletEventListener(Frame frame, PluginAppletViewer appletViewer)
>> + ? ? ? ? {
>> + ? ? ? ? this.frame = frame;
>> + ? ? ? ? this.appletViewer = appletViewer;
>> ? ? ? ? ?}
>> -
>> - ? ? ? ? AccessController.doPrivileged(new PrivilegedAction() {
>> - ? ? ? ? ? ? public Object run() {
>> - ? ? ? ? ? ? ? ? ? ? ? try {
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? panel = new NetxPanel(doc, atts, false);
>> - ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? 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);
>> - ? ? ? ? ? ? ? ? ? ? ? }
>> - ? ? ? ? ? ? ? ? return null;
>> +
>> + ? ? ? ? public void appletStateChanged(AppletEvent evt)
>>
>
> Thanks for doing this, though it shouldn't be necessary to alter the
> changesets when importing (other than ChangeLog merging).
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> 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
>

Could you set the target milestone to 1.7.1 in Bugzilla for the
appropriate bugs fixed here?

Cheers,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 aph at redhat.com  Fri Feb 26 06:07:59 2010
From: aph at redhat.com (Andrew Haley)
Date: Fri, 26 Feb 2010 14:07:59 +0000
Subject: Howto create redistributable packages?
In-Reply-To: <194f62551002260554g159b35d7t5def50619650d977@mail.gmail.com>
References: <194f62551002260554g159b35d7t5def50619650d977@mail.gmail.com>
Message-ID: <4B87D5BF.4000106@redhat.com>

On 02/26/2010 01:54 PM, Clemens Eisserer wrote:

> I would like to build redistributable OpenJDK packages, to allow
> easier testing of my xrender java2d pipeline.
> For now the linux-i586 dir differs quite a bit, compared to Sun's
> tarballs (e.g. no rt.jar, but classes unzipped),
> is there a way to create sun-like packages?

When I build OpenJDK, I have a j2re-image directory that looks
exactly like Sun's distribution.

> Furthermore I guess I may not call it OpenJDK, is there a simple way
> to rename it, or it it sufficient to offer it under a different name?

Everyone else calls it OpenJDK.  You'll have to look
at the licence to see if it suits you.

Andrew.


From xerxes at zafena.se  Fri Feb 26 06:10:34 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 26 Feb 2010 15:10:34 +0100
Subject: RFInclusion into Icedtea6 1.7.1 release branch Shark API fixes
	for llvm 2.7 and Zero syncronization with upstream and zero S390 fixes
In-Reply-To: <4B87D49E.1060401@zafena.se>
References: <4B87D49E.1060401@zafena.se>
Message-ID: <4B87D65A.9070108@zafena.se>

On 2010-02-26 15:03, Xerxes R?nby wrote:
> A list of changesets from Icedtea6 that i would like to have included in
> Icedtea6 1.7.1 releasebranch for improved Shark API compatiblity with
> LLVM 2.7, Zero upstream sync and zero S390 fixes.
>
> http://icedtea.classpath.org/hg/icedtea6/rev/2b86a59d4446 - Whitespace
> fixes
> http://icedtea.classpath.org/hg/icedtea6/rev/a9569f1ff015 - Reformat
> Shark to match upstream HotSpot
> http://icedtea.classpath.org/hg/icedtea6/rev/9748785082e5 - Add 2010 to
> some copyright headers that were missing it
> http://icedtea.classpath.org/hg/icedtea6/rev/fee30f40652c -
> ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
>
> http://icedtea.classpath.org/hg/icedtea6/rev/6571641c60ab - Update Shark
> for LLVM r95390 API change.
> http://icedtea.classpath.org/hg/icedtea6/rev/a508d7cd967a - Backport
> "6927165: Zero S/390 fixes" from upstream
> http://icedtea.classpath.org/hg/icedtea6/rev/6dccdd4c25c7 - Implemented
> Shark host CPU feature autotuner using LLVM 2.7 APIs.
> http://icedtea.classpath.org/hg/icedtea6/rev/8eb821cc2cd0 - Add s390
> support to TCK setup helper script
> http://icedtea.classpath.org/hg/icedtea6/rev/c4148e0a2984 - Synchronize
> Zero with upstream
> http://icedtea.classpath.org/hg/icedtea6/rev/fc600c234771 - Strip stupid
> options that llvm-config supplies
> http://icedtea.classpath.org/hg/icedtea6/rev/22be2c99a89b - Update Shark
> for LLVM r94686 API change.
> http://icedtea.classpath.org/hg/icedtea6/rev/d9e57470d35d - PR
> icedtea/428: Remove -pedantic from LLVM_CFLAGS. (required for Strip
> stupid options that llvm-config supplies)
>
> Ok to merge?
>
> Cheers
> Xerxes
>   
oh these two as well from jan 2010:

http://icedtea.classpath.org/hg/icedtea6/rev/4b6ab0e5a0dd -

* patches/zero/6914622.patch: New file, imports changeset
for Sun bug 6914622 from jdk7/hotspot-comp.
* Makefile.am (ICEDTEA_PATCHES): Added the above.
* contrib/checkopts/checkopts: Updated for the above.

http://icedtea.classpath.org/hg/icedtea6/rev/c99b9280fdcf -

* patches/zero/6909153.patch: New file.
* patches/zero/6913869.patch: Likewise.
* Makefile.am (ICEDTEA_PATCHES): Added the above.




From andrew at icedtea.classpath.org  Fri Feb 26 06:13:35 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 14:13:35 +0000
Subject: /hg/release/icedtea6-1.7: 12 new changesets
Message-ID: <hg.ec3742b13c3d.1267193615.1785565629229908553@icedtea.classpath.org>

changeset ec3742b13c3d in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=ec3742b13c3d
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Jan 15 15:36:43 2010 +0100

	PR icedtea/428: Remove -pedantic from LLVM_CFLAGS. 2010-01-15
	Xerxes R?nby <xerxes at zafena.se>

	 PR icedtea/428:
		* configure.ac (LLVM_CFLAGS): Remove -pedantic from LLVM_CFLAGS.


changeset f3e8f98dbb6c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f3e8f98dbb6c
author: Xerxes R?nby <xerxes at zafena.se>
date: Mon Feb 01 12:28:24 2010 +0100

	Update Shark for LLVM r94686 API change.

	2010-02-01 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Use sharkContext::module
	instead of sharkContext::module_provider when using LLVM 2.7
	to handle LLVM r94686 API change.
		* ports/hotspot/src/share/vm/shark/sharkContext.hpp
	(sharkContext::module): Made public when using LLVM 2.7.
	(sharkContext::module_provider): Undefine when using LLVM 2.7.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.


changeset 9f41e0c31f6a in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=9f41e0c31f6a
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 12 13:24:25 2010 +0000

	Strip stupid options that llvm-config supplies


changeset f2de2e275530 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=f2de2e275530
author: Gary Benson <gbenson at redhat.com>
date: Mon Feb 15 11:41:03 2010 +0000

	Synchronize Zero with upstream


changeset b33d364cfd9c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=b33d364cfd9c
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 16 15:54:50 2010 +0000

	Add s390 support to TCK setup helper script


changeset 706550cd6ad6 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=706550cd6ad6
author: Xerxes R?nby <xerxes at zafena.se>
date: Wed Feb 17 14:46:46 2010 +0100

	Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.

	2010-02-17 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::SharkCompiler): Implement host CPU feature
	autotuner using LLVM 2.7 APIs.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Define
	llvm/ADT/StringMap.h and llvm/System/Host.h depending on
	LLVM version. Allways define llvm/Support/CommandLine.h.


changeset 568b122fc6de in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=568b122fc6de
author: Gary Benson <gbenson at redhat.com>
date: Fri Feb 19 09:58:06 2010 +0000

	Backport "6927165: Zero S/390 fixes" from upstream


changeset 0cf0b14685a3 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=0cf0b14685a3
author: Xerxes R?nby <xerxes at zafena.se>
date: Sun Feb 21 16:24:11 2010 +0100

	Update Shark for LLVM r95390 API change.

	2010-02-21 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(MCPU): Explicitly defined for use by LLVM command line parser.
	(MAttrs): Likewise. (SharkCompiler::SharkCompiler): Create
	the JIT using LLVM EngineBuilder in order to explicitly set
	MCPU and MAttrs when using LLVM 2.7.
		* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp: Include
	llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the JIT
	are linked in.


changeset 98e567a32b04 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=98e567a32b04
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 09:01:28 2010 +0000

	Comment fix


changeset fc1f68bd0bf1 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=fc1f68bd0bf1
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 12:05:51 2010 +0000

	Add 2010 to some copyright headers that were missing it


changeset 6267ffedf454 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6267ffedf454
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 12:08:37 2010 -0500

	Reformat Shark to match upstream HotSpot


changeset 151ff5eb1467 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=151ff5eb1467
author: Gary Benson <gbenson at redhat.com>
date: Tue Feb 23 17:36:57 2010 +0000

	Whitespace fixes


diffstat:

51 files changed, 1117 insertions(+), 1516 deletions(-)
ChangeLog                                                |  152 +++++++++
configure.ac                                             |   37 ++
contrib/jck/compile-native-code.sh                       |    3 
ports/hotspot/make/linux/makefiles/shark.make            |    6 
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp    |   29 +
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp    |    6 
ports/hotspot/src/cpu/zero/vm/globals_zero.hpp           |    4 
ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp     |   12 
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp |    8 
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp |   10 
ports/hotspot/src/share/vm/includeDB_shark               |    2 
ports/hotspot/src/share/vm/shark/llvmHeaders.hpp         |    8 
ports/hotspot/src/share/vm/shark/sharkBlock.cpp          |  157 +++------
ports/hotspot/src/share/vm/shark/sharkBlock.hpp          |   85 +----
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp        |  193 ++++--------
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp        |   14 
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp   |   67 +---
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp   |  129 ++------
ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp     |   18 -
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp       |   96 ++++--
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp       |   15 
ports/hotspot/src/share/vm/shark/sharkConstant.cpp       |    9 
ports/hotspot/src/share/vm/shark/sharkConstant.hpp       |   12 
ports/hotspot/src/share/vm/shark/sharkContext.cpp        |   17 -
ports/hotspot/src/share/vm/shark/sharkContext.hpp        |   95 ++---
ports/hotspot/src/share/vm/shark/sharkEntry.hpp          |   21 -
ports/hotspot/src/share/vm/shark/sharkFunction.cpp       |   46 +-
ports/hotspot/src/share/vm/shark/sharkFunction.hpp       |   37 --
ports/hotspot/src/share/vm/shark/sharkInliner.cpp        |  107 ++----
ports/hotspot/src/share/vm/shark/sharkInliner.hpp        |    2 
ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp     |   34 --
ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp     |    3 
ports/hotspot/src/share/vm/shark/sharkInvariants.cpp     |    3 
ports/hotspot/src/share/vm/shark/sharkInvariants.hpp     |   50 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp  |   51 +--
ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp  |   12 
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp  |   17 -
ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp  |   68 +---
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp        |   52 ---
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp        |   19 -
ports/hotspot/src/share/vm/shark/sharkStack.cpp          |   65 +---
ports/hotspot/src/share/vm/shark/sharkStack.hpp          |   92 ++---
ports/hotspot/src/share/vm/shark/sharkState.cpp          |   42 +-
ports/hotspot/src/share/vm/shark/sharkState.hpp          |   65 +---
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp   |   13 
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp   |    5 
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp  |  222 +++++---------
ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp  |  115 ++-----
ports/hotspot/src/share/vm/shark/sharkType.hpp           |   75 +---
ports/hotspot/src/share/vm/shark/sharkValue.cpp          |  168 +++-------
ports/hotspot/src/share/vm/shark/sharkValue.hpp          |   65 +---

diffs (truncated from 6623 to 500 lines):

diff -r 728d7fbb5008 -r 151ff5eb1467 ChangeLog
--- a/ChangeLog	Thu Feb 25 22:58:15 2010 -0500
+++ b/ChangeLog	Tue Feb 23 17:36:57 2010 +0000
@@ -1,3 +1,155 @@ 2010-02-25  Deepak Bhole <dbhole at redhat.
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Reformatted
+	with trailing opening braces to match upstream HotSpot.
+	* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCodeBuffer.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkConstant.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkEntry.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInliner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkIntrinsics.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkInvariants.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkMemoryManager.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkNativeWrapper.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStack.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkTopLevelBlock.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkType.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Update copyright.
+	* ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp: Likewise.
+
+2010-02-23  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
+
+2010-02-21  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(MCPU): Explicitly defined for use by LLVM command line parser.
+	(MAttrs): Likewise.
+	(SharkCompiler::SharkCompiler): Create the JIT using LLVM EngineBuilder
+	in order to explicitly set MCPU and MAttrs when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Include llvm/ExecutionEngine/JIT.h for LLVM 2.7 to make sure the
+	JIT are linked in.
+
+2010-02-19  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/globals_zero.hpp:
+	Increase StackShadowPages from 3 to 5 on 32-bit platforms.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp
+	(os::atomic_copy64): Added s390 specific implementation.
+
+2010-02-17  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Implement host CPU feature
+	autotuner using LLVM 2.7 APIs.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp:
+	Define llvm/ADT/StringMap.h and llvm/System/Host.h
+	depending on LLVM version.
+	Allways define llvm/Support/CommandLine.h.
+
+2010-02-16  Gary Benson  <gbenson at redhat.com>
+	
+	* contrib/jck/compile-native-code.sh: Add s390.
+
+2010-02-15  Gary Benson  <gbenson at redhat.com>
+
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
+	(CppInterpreter::result_type_of): New method.
+	* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+	(CppInterpreter::result_type_of): Likewise.
+	(CppInterpreter::main_loop): Use the above.
+	(CppInterpreter::native_entry): Likewise.
+	* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+	(os::is_allocatable): s/AMD64/_LP64/.
+
+2010-02-12  Gary Benson  <gbenson at redhat.com>
+
+	* configure.ac: Strip stupid options that llvm-config supplies.
+
+2010-02-01  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::SharkCompiler): Use sharkContext::module
+	instead of sharkContext::module_provider when using LLVM 2.7
+	to handle LLVM r94686 API change.
+	* ports/hotspot/src/share/vm/shark/sharkContext.hpp
+	(sharkContext::module): Made public when using LLVM 2.7.
+	(sharkContext::module_provider): Undefine when using LLVM 2.7.
+	* ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
+	(llvm/ModuleProvider.h): Undefine when using LLVM 2.7.
+
+2010-01-15  Xerxes R??nby  <xerxes at zafena.se>
+
+	PR icedtea/428:
+	* configure.ac (LLVM_CFLAGS): Remove -pedantic from LLVM_CFLAGS.
+
 2010-02-25  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/java/sun/applet/PluginMain.java: Add some javaplugin.*
diff -r 728d7fbb5008 -r 151ff5eb1467 configure.ac
--- a/configure.ac	Thu Feb 25 22:58:15 2010 -0500
+++ b/configure.ac	Tue Feb 23 17:36:57 2010 +0000
@@ -433,12 +433,39 @@ if test "x${SHARK_BUILD_TRUE}" = x || te
 if test "x${SHARK_BUILD_TRUE}" = x || test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   FIND_TOOL([LLVM_CONFIG], [llvm-config])
   llvm_components="jit engine nativecodegen"
-  LLVM_CFLAGS=`$LLVM_CONFIG --cxxflags $llvm_components | \
-    sed -e 's/-O.//g' | sed -e 's/-fomit-frame-pointer//g' | \
-    sed -e 's/-D_DEBUG//g'`
+  dnl LLVM_CFLAGS
+  LLVM_CFLAGS=
+  for flag in $($LLVM_CONFIG --cxxflags $llvm_components); do
+    if echo "$flag" | grep -q '^-[[ID]]'; then
+      if test "$flag" != "-D_DEBUG"; then
+        if test "x$LLVM_CFLAGS" != "x"; then
+          LLVM_CFLAGS="$LLVM_CFLAGS "
+        fi
+        LLVM_CFLAGS="$LLVM_CFLAGS$flag"
+      fi
+    fi
+  done
+  dnl LLVM_LDFLAGS
+  LLVM_LDFLAGS=
+  for flag in $($LLVM_CONFIG --ldflags $llvm_components); do
+    if echo "$flag" | grep -q '^-L'; then
+      if test "x$LLVM_LDFLAGS" != "x"; then
+        LLVM_LDFLAGS="$LLVM_LDFLAGS "
+      fi
+      LLVM_LDFLAGS="$LLVM_LDFLAGS$flag"
+    fi
+  done
+  dnl LLVM_LIBS
+  LLVM_LIBS=
+  for flag in $($LLVM_CONFIG --libs $llvm_components); do
+    if echo "$flag" | grep -q '^-l'; then
+      if test "x$LLVM_LIBS" != "x"; then
+        LLVM_LIBS="$LLVM_LIBS "
+      fi
+      LLVM_LIBS="$LLVM_LIBS$flag"
+    fi
+  done
   LLVM_CFLAGS="$LLVM_CFLAGS -DSHARK_LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/\.//;s/svn.*//'`"
-  LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags $llvm_components`
-  LLVM_LIBS=`$LLVM_CONFIG --libs $llvm_components`
 fi
 AC_SUBST(LLVM_CFLAGS)
 AC_SUBST(LLVM_LDFLAGS)
diff -r 728d7fbb5008 -r 151ff5eb1467 contrib/jck/compile-native-code.sh
--- a/contrib/jck/compile-native-code.sh	Thu Feb 25 22:58:15 2010 -0500
+++ b/contrib/jck/compile-native-code.sh	Tue Feb 23 17:36:57 2010 +0000
@@ -21,6 +21,9 @@ case "$arch" in
 case "$arch" in
   arm*)
     MFLAG=
+    ;;
+  s390)
+    MFLAG=-m31
     ;;
   i?86|ppc)
     MFLAG=-m32
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/make/linux/makefiles/shark.make
--- a/ports/hotspot/make/linux/makefiles/shark.make	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/make/linux/makefiles/shark.make	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 #
 # Copyright 1999-2005 Sun Microsystems, Inc.  All Rights Reserved.
-# Copyright 2008 Red Hat, Inc.
+# Copyright 2008, 2010 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -20,10 +20,10 @@
 # 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.
-#  
+#
 #
 
-# Sets make macros for making shark version of VM
+# Sets make macros for making Shark version of VM
 
 TYPE = SHARK
 
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -145,7 +145,7 @@ void CppInterpreter::main_loop(int recur
     }
     else if (istate->msg() == BytecodeInterpreter::return_from_method) {
       // Copy the result into the caller's frame
-      result_slots = type2size[method->result_type()];
+      result_slots = type2size[result_type_of(method)];
       assert(result_slots >= 0 && result_slots <= 2, "what?");
       result = istate->stack() + result_slots;
       break;
@@ -394,9 +394,10 @@ void CppInterpreter::native_entry(method
 
   // Push our result
   if (!HAS_PENDING_EXCEPTION) {
-    stack->set_sp(stack->sp() - type2size[method->result_type()]);
+    BasicType type = result_type_of(method);
+    stack->set_sp(stack->sp() - type2size[type]);
 
-    switch (method->result_type()) {
+    switch (type) {
     case T_VOID:
       break;
 
@@ -707,6 +708,26 @@ int AbstractInterpreter::BasicType_as_in
   return i;
 }
 
+BasicType CppInterpreter::result_type_of(methodOop method) {
+  BasicType t;
+  switch (method->result_index()) {
+    case 0 : t = T_BOOLEAN; break;
+    case 1 : t = T_CHAR;    break;
+    case 2 : t = T_BYTE;    break;
+    case 3 : t = T_SHORT;   break;
+    case 4 : t = T_INT;     break;
+    case 5 : t = T_LONG;    break;
+    case 6 : t = T_VOID;    break;
+    case 7 : t = T_FLOAT;   break;
+    case 8 : t = T_DOUBLE;  break;
+    case 9 : t = T_OBJECT;  break;
+    default: ShouldNotReachHere();
+  }
+  assert(AbstractInterpreter::BasicType_as_index(t) == method->result_index(),
+         "out of step with AbstractInterpreter::BasicType_as_index");
+  return t;
+}
+
 address InterpreterGenerator::generate_empty_entry() {
   if (!UseFastEmptyMethods)
     return NULL;
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,3 +41,7 @@
  private:
   // Stack overflow checks
   static bool stack_overflow_imminent(JavaThread *thread);
+
+ private:
+  // Fast result type determination
+  static BasicType result_type_of(methodOop method);
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/globals_zero.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2006 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,7 +50,7 @@ define_pd_global(intx,  PreInflateSpin, 
 
 define_pd_global(intx,  StackYellowPages,     2);
 define_pd_global(intx,  StackRedPages,        1);
-define_pd_global(intx,  StackShadowPages,     3 LP64_ONLY(+3) DEBUG_ONLY(+3));
+define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
 
 define_pd_global(bool,  RewriteBytecodes,     true);
 define_pd_global(bool,  RewriteFrequentPairs, true);
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/cpu/zero/vm/shark_globals_zero.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2008 Red Hat, Inc.
+ * Copyright 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -20,13 +20,11 @@
  * 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.
- *  
+ *
  */
 
-//
-// Sets the default values for platform dependent flags used by the
-// Shark compiler.
-//
+// Set the default values for platform dependent flags used by the
+// Shark compiler.  See globals.hpp for details of what they do.
 
 define_pd_global(bool,  BackgroundCompilation,        true );
 define_pd_global(bool,  UseTLAB,                      true );
@@ -52,7 +50,7 @@ define_pd_global(intx,  NewRatio,       
 define_pd_global(intx,  NewRatio,                     12   );
 define_pd_global(intx,  NewSizeThreadIncrease,        4*K  );
 define_pd_global(intx,  InitialCodeCacheSize,         160*K);
-define_pd_global(intx,  ReservedCodeCacheSize,        32*M ); 
+define_pd_global(intx,  ReservedCodeCacheSize,        32*M );
 define_pd_global(bool,  ProfileInterpreter,           false);
 define_pd_global(intx,  CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,      1    );
diff -r 728d7fbb5008 -r 151ff5eb1467 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 Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2007 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -249,11 +249,9 @@ void os::Linux::set_fpu_control_word(int
 }
 
 bool os::is_allocatable(size_t bytes) {
-#ifdef AMD64
-  // unused on amd64?
+#ifdef _LP64
   return true;
 #else
-
   if (bytes < 2 * G) {
     return true;
   }
@@ -265,7 +263,7 @@ bool os::is_allocatable(size_t bytes) {
   }
 
   return addr != NULL;
-#endif // AMD64
+#endif // _LP64
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff -r 728d7fbb5008 -r 151ff5eb1467 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	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2004 Sun Microsystems, Inc.  All Rights Reserved.
- * Copyright 2007, 2008 Red Hat, Inc.
+ * Copyright 2007, 2008, 2010 Red Hat, Inc.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,13 @@
                   "stfd %0, 0(%2)\n"
                   : "=f"(tmp)
                   : "b"(src), "b"(dst));
+#elif defined(S390) && !defined(_LP64)
+    double tmp;
+    asm volatile ("ld  %0, 0(%1)\n"
+                  "std %0, 0(%2)\n"
+                  : "=r"(tmp)
+                  : "a"(src), "a"(dst));
 #else
     *(jlong *) dst = *(jlong *) src;
-#endif // PPC && !_LP64
+#endif
   }
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/share/vm/includeDB_shark
--- a/ports/hotspot/src/share/vm/includeDB_shark	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/share/vm/includeDB_shark	Tue Feb 23 17:36:57 2010 +0000
@@ -20,7 +20,7 @@
 // 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.
-//  
+//
 //
 
 // NOTE: DO NOT CHANGE THIS COPYRIGHT TO NEW STYLE - IT WILL BREAK makeDeps!
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/share/vm/shark/llvmHeaders.hpp
--- a/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/llvmHeaders.hpp	Tue Feb 23 17:36:57 2010 +0000
@@ -34,16 +34,20 @@
 #include <llvm/Instructions.h>
 #include <llvm/LLVMContext.h>
 #include <llvm/Module.h>
+#if SHARK_LLVM_VERSION < 27
 #include <llvm/ModuleProvider.h>
+#endif
 #include <llvm/Support/IRBuilder.h>
 #include <llvm/System/Threading.h>
 #include <llvm/Target/TargetSelect.h>
 #include <llvm/Type.h>
 #include <llvm/ExecutionEngine/JITMemoryManager.h>
-#if SHARK_LLVM_VERSION < 27
 #include <llvm/Support/CommandLine.h>
-#else
+#if SHARK_LLVM_VERSION >= 27
+#include <llvm/ExecutionEngine/JIT.h>
+#include <llvm/ADT/StringMap.h>
 #include <llvm/Support/Debug.h>
+#include <llvm/System/Host.h>
 #endif
 
 #include <map>
diff -r 728d7fbb5008 -r 151ff5eb1467 ports/hotspot/src/share/vm/shark/sharkBlock.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Thu Feb 25 22:58:15 2010 -0500
+++ b/ports/hotspot/src/share/vm/shark/sharkBlock.cpp	Tue Feb 23 17:36:57 2010 +0000
@@ -28,8 +28,7 @@
 
 using namespace llvm;
 
-void SharkBlock::parse_bytecode(int start, int limit)
-{
+void SharkBlock::parse_bytecode(int start, int limit) {
   SharkValue *a, *b, *c, *d;
   int i;
 
@@ -45,7 +44,7 @@ void SharkBlock::parse_bytecode(int star
 
     if (SharkTraceBytecodes)
       tty->print_cr("%4d: %s", bci(), Bytecodes::name(bc()));
-    
+
     if (has_trap() && trap_bci() == bci()) {
       do_trap(trap_request());
       return;
@@ -96,7 +95,7 @@ void SharkBlock::parse_bytecode(int star


From gnu_andrew at member.fsf.org  Fri Feb 26 06:13:40 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 14:13:40 +0000
Subject: RFInclusion into Icedtea6 1.7.1 release branch Shark API fixes 
	for llvm 2.7 and Zero syncronization with upstream and zero S390 fixes
In-Reply-To: <4B87D49E.1060401@zafena.se>
References: <4B87D49E.1060401@zafena.se>
Message-ID: <17c6771e1002260613t21679309u84e812fa390843df@mail.gmail.com>

On 26 February 2010 14:03, Xerxes R?nby <xerxes at zafena.se> wrote:
> A list of changesets from Icedtea6 that i would like to have included in
> Icedtea6 1.7.1 releasebranch for improved Shark API compatiblity with
> LLVM 2.7, Zero upstream sync and zero S390 fixes.
>
> http://icedtea.classpath.org/hg/icedtea6/rev/2b86a59d4446 - Whitespace
> fixes
> http://icedtea.classpath.org/hg/icedtea6/rev/a9569f1ff015 - Reformat
> Shark to match upstream HotSpot
> http://icedtea.classpath.org/hg/icedtea6/rev/9748785082e5 - Add 2010 to
> some copyright headers that were missing it
> http://icedtea.classpath.org/hg/icedtea6/rev/fee30f40652c -
> ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
>
> http://icedtea.classpath.org/hg/icedtea6/rev/6571641c60ab - Update Shark
> for LLVM r95390 API change.
> http://icedtea.classpath.org/hg/icedtea6/rev/a508d7cd967a - Backport
> "6927165: Zero S/390 fixes" from upstream
> http://icedtea.classpath.org/hg/icedtea6/rev/6dccdd4c25c7 - Implemented
> Shark host CPU feature autotuner using LLVM 2.7 APIs.
> http://icedtea.classpath.org/hg/icedtea6/rev/8eb821cc2cd0 - Add s390
> support to TCK setup helper script
> http://icedtea.classpath.org/hg/icedtea6/rev/c4148e0a2984 - Synchronize
> Zero with upstream
> http://icedtea.classpath.org/hg/icedtea6/rev/fc600c234771 - Strip stupid
> options that llvm-config supplies
> http://icedtea.classpath.org/hg/icedtea6/rev/22be2c99a89b - Update Shark
> for LLVM r94686 API change.
> http://icedtea.classpath.org/hg/icedtea6/rev/d9e57470d35d - PR
> icedtea/428: Remove -pedantic from LLVM_CFLAGS. (required for Strip
> stupid options that llvm-config supplies)
>
> Ok to merge?
>
> Cheers
> Xerxes
>

This bunch are done.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 andrew at icedtea.classpath.org  Fri Feb 26 06:16:18 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 14:16:18 +0000
Subject: /hg/release/icedtea6-1.7: 2 new changesets
Message-ID: <hg.e7f06018d875.1267193778.1785565629229908553@icedtea.classpath.org>

changeset e7f06018d875 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=e7f06018d875
author: Gary Benson <gbenson at redhat.com>
date: Tue Jan 05 10:09:26 2010 +0000

	2010-01-05 Gary Benson <gbenson at redhat.com>

	 * patches/zero/6909153.patch: New file.
		* patches/zero/6913869.patch: Likewise.
		* Makefile.am (ICEDTEA_PATCHES): Added the above.


changeset 398a7f03255b in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=398a7f03255b
author: Gary Benson <gbenson at redhat.com>
date: Mon Jan 11 11:43:43 2010 +0000

	2010-01-11 Gary Benson <gbenson at redhat.com>

	 * patches/zero/6914622.patch: New file, imports changeset
	for Sun bug 6914622 from jdk7/hotspot-comp.
		* Makefile.am (ICEDTEA_PATCHES): Added the above.
		* contrib/checkopts/checkopts: Updated for the above.


diffstat:

6 files changed, 170 insertions(+), 1 deletion(-)
ChangeLog                   |   13 +++++
Makefile.am                 |    3 +
contrib/checkopts/checkopts |    5 +-
patches/zero/6909153.patch  |   40 +++++++++++++++++
patches/zero/6913869.patch  |   12 +++++
patches/zero/6914622.patch  |   98 +++++++++++++++++++++++++++++++++++++++++++

diffs (217 lines):

diff -r 151ff5eb1467 -r 398a7f03255b ChangeLog
--- a/ChangeLog	Tue Feb 23 17:36:57 2010 +0000
+++ b/ChangeLog	Mon Jan 11 11:43:43 2010 +0000
@@ -1,3 +1,16 @@ 2010-02-23  Gary Benson  <gbenson at redhat
+2010-01-11  Gary Benson  <gbenson at redhat.com>
+
+	* patches/zero/6914622.patch: New file, imports changeset
+	for Sun	bug 6914622 from jdk7/hotspot-comp.
+	* Makefile.am (ICEDTEA_PATCHES): Added the above.
+	* contrib/checkopts/checkopts: Updated for the above.
+
+2010-01-05  Gary Benson  <gbenson at redhat.com>
+
+	* patches/zero/6909153.patch: New file.
+	* patches/zero/6913869.patch: Likewise.
+	* Makefile.am (ICEDTEA_PATCHES): Added the above.
+
 2010-02-23  Gary Benson  <gbenson at redhat.com>
 
 	* ports/hotspot/make/linux/makefiles/shark.make: Whitespace fixes.
diff -r 151ff5eb1467 -r 398a7f03255b Makefile.am
--- a/Makefile.am	Tue Feb 23 17:36:57 2010 +0000
+++ b/Makefile.am	Mon Jan 11 11:43:43 2010 +0000
@@ -204,6 +204,9 @@ ICEDTEA_PATCHES = \
 	patches/zero/6891677.patch \
 	patches/zero/6896043.patch \
 	patches/zero/6903453.patch \
+	patches/zero/6909153.patch \
+	patches/zero/6913869.patch \
+	patches/zero/6914622.patch \
 	patches/icedtea-notice-safepoints.patch \
 	patches/icedtea-parisc-opt.patch \
 	patches/icedtea-lucene-crash.patch \
diff -r 151ff5eb1467 -r 398a7f03255b contrib/checkopts/checkopts
--- a/contrib/checkopts/checkopts	Tue Feb 23 17:36:57 2010 +0000
+++ b/contrib/checkopts/checkopts	Mon Jan 11 11:43:43 2010 +0000
@@ -23,6 +23,7 @@ class Flag:
     def test_values(self):
         if self.type == "bool":
             if self.name in (
+                "PrintFlagsInitial",    # already done :)
                 "ExtendedDTraceProbes", # Solaris only
                 "RequireSharedSpaces",  # Not set up
                 "PauseAtStartup"):      # Just don't...
@@ -62,7 +63,9 @@ class Main:
 
     def read_flags(self):
         out, err = subprocess.Popen(
-            [self.java, "-XX:+UnlockDiagnosticVMOptions", "-Xprintflags"],
+            [self.java,
+             "-XX:+UnlockDiagnosticVMOptions",
+             "-XX:+PrintFlagsInitial"],
             stdout = subprocess.PIPE,
             stderr = subprocess.PIPE).communicate()
         if err:
diff -r 151ff5eb1467 -r 398a7f03255b patches/zero/6909153.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6909153.patch	Mon Jan 11 11:43:43 2010 +0000
@@ -0,0 +1,40 @@
+diff -r 1ea456c6f2b7 -r 40e7c1d24e4a src/share/vm/compiler/compileBroker.cpp
+--- openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	Tue Dec 22 17:56:03 2009 -0800
++++ openjdk/hotspot/src/share/vm/compiler/compileBroker.cpp	Mon Jan 04 00:22:57 2010 -0800
+@@ -1820,9 +1820,11 @@
+                 CompileBroker::_t_standard_compilation.seconds(),
+                 CompileBroker::_t_standard_compilation.seconds() / CompileBroker::_total_standard_compile_count);
+   tty->print_cr("    On stack replacement   : %6.3f s, Average : %2.3f", CompileBroker::_t_osr_compilation.seconds(), CompileBroker::_t_osr_compilation.seconds() / CompileBroker::_total_osr_compile_count);
+-  compiler(CompLevel_fast_compile)->print_timers();
+-  if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier)) {
+-    compiler(CompLevel_highest_tier)->print_timers();
++
++  if (compiler(CompLevel_fast_compile)) {
++    compiler(CompLevel_fast_compile)->print_timers();
++    if (compiler(CompLevel_fast_compile) != compiler(CompLevel_highest_tier))
++      compiler(CompLevel_highest_tier)->print_timers();
+   }
+ 
+   tty->cr();
+diff -r 1ea456c6f2b7 -r 40e7c1d24e4a src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 22 17:56:03 2009 -0800
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Mon Jan 04 00:22:57 2010 -0800
+@@ -2756,9 +2756,16 @@
+   set_aggressive_opts_flags();
+ 
+ #ifdef CC_INTERP
+-  // Biased locking is not implemented with c++ interpreter
++  // Clear flags not supported by the C++ interpreter
++  FLAG_SET_DEFAULT(ProfileInterpreter, false);
+   FLAG_SET_DEFAULT(UseBiasedLocking, false);
+-#endif /* CC_INTERP */
++  LP64_ONLY(FLAG_SET_DEFAULT(UseCompressedOops, false));
++#endif // CC_INTERP
++
++#ifdef ZERO
++  // Clear flags not supported by Zero
++  FLAG_SET_DEFAULT(TaggedStackInterpreter, false);
++#endif // ZERO
+ 
+ #ifdef COMPILER2
+   if (!UseBiasedLocking || EmitSync != 0) {
diff -r 151ff5eb1467 -r 398a7f03255b patches/zero/6913869.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6913869.patch	Mon Jan 11 11:43:43 2010 +0000
@@ -0,0 +1,12 @@
+diff -r 40e7c1d24e4a -r 896da934748c src/share/vm/prims/jni.cpp
+--- openjdk/hotspot/src/share/vm/prims/jni.cpp	Mon Jan 04 00:22:57 2010 -0800
++++ openjdk/hotspot/src/share/vm/prims/jni.cpp	Mon Jan 04 03:34:40 2010 -0800
+@@ -3241,7 +3241,7 @@
+     jint b = Atomic::xchg(0xdeadbeef, &a);
+     void *c = &a;
+     void *d = Atomic::xchg_ptr(&b, &c);
+-    assert(a == 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
++    assert(a == (jint) 0xdeadbeef && b == (jint) 0xcafebabe, "Atomic::xchg() works");
+     assert(c == &b && d == &a, "Atomic::xchg_ptr() works");
+   }
+ #endif // ZERO && ASSERT
diff -r 151ff5eb1467 -r 398a7f03255b patches/zero/6914622.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/zero/6914622.patch	Mon Jan 11 11:43:43 2010 +0000
@@ -0,0 +1,98 @@
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/arguments.cpp
+--- openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/arguments.cpp	Thu Jan 07 16:24:17 2010 -0800
+@@ -2633,6 +2633,10 @@
+     if (match_option(option, "-XX:-IgnoreUnrecognizedVMOptions", &tail)) {
+       IgnoreUnrecognizedVMOptions = false;
+     }
++    if (match_option(option, "-XX:+PrintFlagsInitial", &tail)) {
++      CommandLineFlags::printFlags();
++      vm_exit(0);
++    }
+   }
+ 
+   if (IgnoreUnrecognizedVMOptions) {
+@@ -2795,11 +2799,9 @@
+     CommandLineFlags::printSetFlags();
+   }
+ 
+-#ifdef ASSERT
+   if (PrintFlagsFinal) {
+     CommandLineFlags::printFlags();
+   }
+-#endif
+ 
+   return JNI_OK;
+ }
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/globals.cpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.cpp	Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/globals.cpp	Thu Jan 07 16:24:17 2010 -0800
+@@ -468,6 +468,8 @@
+   assert(Arguments::check_vm_args_consistency(), "Some flag settings conflict");
+ }
+ 
++#endif // PRODUCT
++
+ void CommandLineFlags::printFlags() {
+   // Print the flags sorted by name
+   // note: this method is called before the thread structure is in place
+@@ -493,5 +495,3 @@
+   }
+   FREE_C_HEAP_ARRAY(Flag*, array);
+ }
+-
+-#endif
+diff -r 9b9c1ee9b3f6 -r f62a22282a47 src/share/vm/runtime/globals.hpp
+--- openjdk/hotspot/src/share/vm/runtime/globals.hpp	Wed Jan 06 22:21:39 2010 -0800
++++ openjdk/hotspot/src/share/vm/runtime/globals.hpp	Thu Jan 07 16:24:17 2010 -0800
+@@ -211,7 +211,7 @@
+   static bool wasSetOnCmdline(const char* name, bool* value);
+   static void printSetFlags();
+ 
+-  static void printFlags() PRODUCT_RETURN;
++  static void printFlags();
+ 
+   static void verify() PRODUCT_RETURN;
+ };
+@@ -327,9 +327,6 @@
+   product(bool, UseMembar, false,                                           \
+           "(Unstable) Issues membars on thread state transitions")          \
+                                                                             \
+-  product(bool, PrintCommandLineFlags, false,                               \
+-          "Prints flags that appeared on the command line")                 \
+-                                                                            \
+   diagnostic(bool, UnlockDiagnosticVMOptions, trueInDebug,                  \
+           "Enable normal processing of flags relating to field diagnostics")\
+                                                                             \
+@@ -1967,9 +1964,6 @@
+           "number of times a GC thread (minus the coordinator) "            \
+           "will sleep while yielding before giving up and resuming GC")     \
+                                                                             \
+-  notproduct(bool, PrintFlagsFinal, false,                                  \
+-          "Print all command line flags after argument processing")         \
+-                                                                            \
+   /* gc tracing */                                                          \
+   manageable(bool, PrintGC, false,                                          \
+           "Print message at garbage collect")                               \
+@@ -2269,11 +2263,20 @@
+          "If false, restricts profiled locations to the root method only")  \
+                                                                             \
+   product(bool, PrintVMOptions, trueInDebug,                                \
+-         "print VM flag settings")                                          \
++         "Print flags that appeared on the command line")                   \
+                                                                             \
+   product(bool, IgnoreUnrecognizedVMOptions, false,                         \
+          "Ignore unrecognized VM options")                                  \
+                                                                             \
++  product(bool, PrintCommandLineFlags, false,                               \
++         "Print flags specified on command line or set by ergonomics")      \
++                                                                            \
++  product(bool, PrintFlagsInitial, false,                                   \
++         "Print all VM flags before argument processing and exit VM")       \
++                                                                            \
++  product(bool, PrintFlagsFinal, false,                                     \
++         "Print all VM flags after argument and ergonomic processing")      \
++                                                                            \
+   diagnostic(bool, SerializeVMOutput, true,                                 \
+          "Use a mutex to serialize output to tty and hotspot.log")          \
+                                                                             \


From gnu_andrew at member.fsf.org  Fri Feb 26 06:17:28 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 14:17:28 +0000
Subject: RFInclusion into Icedtea6 1.7.1 release branch Shark API fixes 
	for llvm 2.7 and Zero syncronization with upstream and zero S390 fixes
In-Reply-To: <4B87D65A.9070108@zafena.se>
References: <4B87D49E.1060401@zafena.se> <4B87D65A.9070108@zafena.se>
Message-ID: <17c6771e1002260617x6a9677cbvf7b6a4fd389368b5@mail.gmail.com>

On 26 February 2010 14:10, Xerxes R?nby <xerxes at zafena.se> wrote:
> On 2010-02-26 15:03, Xerxes R?nby wrote:
>> A list of changesets from Icedtea6 that i would like to have included in
>> Icedtea6 1.7.1 releasebranch for improved Shark API compatiblity with
>> LLVM 2.7, Zero upstream sync and zero S390 fixes.
>>
>> http://icedtea.classpath.org/hg/icedtea6/rev/2b86a59d4446 - Whitespace
>> fixes
>> http://icedtea.classpath.org/hg/icedtea6/rev/a9569f1ff015 - Reformat
>> Shark to match upstream HotSpot
>> http://icedtea.classpath.org/hg/icedtea6/rev/9748785082e5 - Add 2010 to
>> some copyright headers that were missing it
>> http://icedtea.classpath.org/hg/icedtea6/rev/fee30f40652c -
>> ports/hotspot/make/linux/makefiles/shark.make: Comment fix.
>>
>> http://icedtea.classpath.org/hg/icedtea6/rev/6571641c60ab - Update Shark
>> for LLVM r95390 API change.
>> http://icedtea.classpath.org/hg/icedtea6/rev/a508d7cd967a - Backport
>> "6927165: Zero S/390 fixes" from upstream
>> http://icedtea.classpath.org/hg/icedtea6/rev/6dccdd4c25c7 - Implemented
>> Shark host CPU feature autotuner using LLVM 2.7 APIs.
>> http://icedtea.classpath.org/hg/icedtea6/rev/8eb821cc2cd0 - Add s390
>> support to TCK setup helper script
>> http://icedtea.classpath.org/hg/icedtea6/rev/c4148e0a2984 - Synchronize
>> Zero with upstream
>> http://icedtea.classpath.org/hg/icedtea6/rev/fc600c234771 - Strip stupid
>> options that llvm-config supplies
>> http://icedtea.classpath.org/hg/icedtea6/rev/22be2c99a89b - Update Shark
>> for LLVM r94686 API change.
>> http://icedtea.classpath.org/hg/icedtea6/rev/d9e57470d35d - PR
>> icedtea/428: Remove -pedantic from LLVM_CFLAGS. (required for Strip
>> stupid options that llvm-config supplies)
>>
>> Ok to merge?
>>
>> Cheers
>> Xerxes
>>
> oh these two as well from jan 2010:
>
> http://icedtea.classpath.org/hg/icedtea6/rev/4b6ab0e5a0dd -
>
> * patches/zero/6914622.patch: New file, imports changeset
> for Sun bug 6914622 from jdk7/hotspot-comp.
> * Makefile.am (ICEDTEA_PATCHES): Added the above.
> * contrib/checkopts/checkopts: Updated for the above.
>
> http://icedtea.classpath.org/hg/icedtea6/rev/c99b9280fdcf -
>
> * patches/zero/6909153.patch: New file.
> * patches/zero/6913869.patch: Likewise.
> * Makefile.am (ICEDTEA_PATCHES): Added the above.
>
>
>

These are in now as well.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 andrew at icedtea.classpath.org  Fri Feb 26 06:25:52 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 14:25:52 +0000
Subject: /hg/release/icedtea6-1.7: 5 new changesets
Message-ID: <hg.6c9f8be2112d.1267194352.1785565629229908553@icedtea.classpath.org>

changeset 6c9f8be2112d in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6c9f8be2112d
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Feb 15 17:25:12 2010 +0000

	Add class file rewriter which will be used to solve the Rhino issue:
	http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=179 once
	hooked into the build.

	2010-02-15 Andrew John Hughes <ahughes at redhat.com>

	 * rewriter/agpl-3.0.txt,
		* rewriter/com/redhat/rewriter/ClassRewriter.java: Add class
	rewriter for fixing Rhino classes to use the
	com.sun.org.mozilla namespace, along with corresponding
	license.


changeset 1d8cf45a1b92 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=1d8cf45a1b92
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 17 23:15:20 2010 +0000

	Fix a number of issues and enable the Rhino rewriter in the build.

	2010-02-17 Andrew John Hughes <ahughes at redhat.com>

	 PR icedtea/179
		* ChangeLog: Remove rogue whitespace highlighted by emacs.
		* Makefile.am: (REWRITER_SRCS): Sources for class file
	rewriter. Only set RHINO_JAR when WITH_RHINO is set. Point
	to rewritten JAR file in build directory. Add rewriter and
	license to EXTRA_DIST. Make icedtea, icedtea-debug and
	icedtea-ecj depend on rewrite-rhino.stamp.
	(stamps/rewriter.stamp): Build the class file rewriter.
	(stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
	file to use the sun.org.mozilla namespace to avoid conflicts.
	(rewriter): New alias for stamps/rewriter.stamp. (rewrite-
	rhino): Likewise for stamps/rewrite-rhino.stamp.
		* patches/icedtea-rhino.patch: Copy rather than symlink the
	JAR file. Only drop the internal suffix on the javascript
	package names.
		* rewriter/com/redhat/rewriter/ClassRewriter.java: (executor):
	Use a single threaded executor when debugging is enabled.
	(tasks): Store the Futures returned by the executor for
	later checking. (main(String[])): Log what happens when
	processFile returns and handle any exceptions using Futures.
	(call()): Ensure srcDir/destDir replacement always matches
	with a trailing slash to avoid odd rewrites. Loop directory
	creation to avoid possible race issues. Increase logging and
	fix a number of issues with the rewrite:
		  * Fix off-by-one loop bug so final entry is inspected.
		  * Handle double entries which occur with 8-byte entries
	(doubles and longs): http://java.sun.com/docs/books/jvms/sec
	ond_edition/html/ClassFile.doc.html#16628


changeset 82a1b4fa752e in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=82a1b4fa752e
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 19 14:19:25 2010 +0000

	Make sure the RHINO_JAR variable always refers to a valid file.

	2010-02-19 Andrew John Hughes <ahughes at redhat.com>

	 * acinclude.m4: (FIND_RHINO_JAR): Clear RHINO_JAR
	variable if it still contains "no" at the end of the
	macro.


changeset 688aa682ce06 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=688aa682ce06
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 20:56:59 2010 +0000

	Use full path to jar application when rewriting Rhino files.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (rewrite-rhino.stamp): Use full path
	to jar application to avoid relying on the one on
	the path.


changeset d6610428db7d in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=d6610428db7d
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 23:30:18 2010 +0000

	Ensure THANKYOU is distributed in the tarball. Remove duplicate
	AUTHORS file.

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add THANKYOU to EXTRA_DIST.
		* pulseaudio/AUTHORS: Removed; duplicates top-level file.


diffstat:

7 files changed, 1089 insertions(+), 21 deletions(-)
ChangeLog                                       |   64 ++
Makefile.am                                     |   63 +-
acinclude.m4                                    |    4 
patches/icedtea-rhino.patch                     |   20 
pulseaudio/AUTHORS                              |    5 
rewriter/agpl-3.0.txt                           |  661 +++++++++++++++++++++++
rewriter/com/redhat/rewriter/ClassRewriter.java |  293 ++++++++++

diffs (truncated from 1294 to 500 lines):

diff -r 398a7f03255b -r d6610428db7d ChangeLog
--- a/ChangeLog	Mon Jan 11 11:43:43 2010 +0000
+++ b/ChangeLog	Wed Feb 24 23:30:18 2010 +0000
@@ -1,3 +1,67 @@ 2010-01-11  Gary Benson  <gbenson at redhat
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am: Add THANKYOU to
+	EXTRA_DIST.
+	* pulseaudio/AUTHORS: Removed; duplicates
+	top-level file.
+
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(rewrite-rhino.stamp): Use full path to
+	jar application to avoid relying on the one
+	on the path.
+
+2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
+
+	* acinclude.m4:
+	(FIND_RHINO_JAR): Clear RHINO_JAR variable
+	if it still contains "no" at the end of the
+	macro.
+
+2010-02-17 Andrew John Hughes  <ahughes at redhat.com>
+
+	PR icedtea/179
+	* ChangeLog: Remove rogue whitespace highlighted
+	by emacs.
+	* Makefile.am:
+	(REWRITER_SRCS): Sources for class file rewriter.
+	Only set RHINO_JAR when WITH_RHINO is set.  Point
+	to rewritten JAR file in build directory.  Add
+	rewriter and license to EXTRA_DIST.  Make icedtea,
+	icedtea-debug and icedtea-ecj depend on rewrite-rhino.stamp.
+	(stamps/rewriter.stamp): Build the class file rewriter.
+	(stamps/rewrite-rhino.stamp): Rewrite the system Rhino JAR
+	file to use the sun.org.mozilla namespace to avoid conflicts.
+	(rewriter): New alias for stamps/rewriter.stamp.
+	(rewrite-rhino): Likewise for stamps/rewrite-rhino.stamp.
+	* patches/icedtea-rhino.patch:
+	Copy rather than symlink the JAR file.  Only drop the
+	internal suffix on the javascript package names.
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	(executor): Use a single threaded executor when
+	debugging is enabled.
+	(tasks): Store the Futures returned by the executor
+	for later checking.
+	(main(String[])): Log what happens when processFile
+	returns and handle any exceptions using Futures.
+	(call()): Ensure srcDir/destDir replacement always
+	matches with a trailing slash to avoid odd rewrites.
+	Loop directory creation to avoid possible race issues.
+	Increase logging and fix a number of issues with the rewrite:
+	  * Fix off-by-one loop bug so final entry is inspected.
+	  * Handle double entries which occur with 8-byte entries
+	    (doubles and longs):
+	http://java.sun.com/docs/books/jvms/second_edition/html/ClassFile.doc.html#16628
+
+2010-02-15 Andrew John Hughes  <ahughes at redhat.com>
+
+	* rewriter/agpl-3.0.txt,
+	* rewriter/com/redhat/rewriter/ClassRewriter.java:
+	Add class rewriter for fixing Rhino classes
+	to use the com.sun.org.mozilla namespace,
+	along with corresponding license.
+
 2010-01-11  Gary Benson  <gbenson at redhat.com>
 
 	* patches/zero/6914622.patch: New file, imports changeset
diff -r 398a7f03255b -r d6610428db7d Makefile.am
--- a/Makefile.am	Mon Jan 11 11:43:43 2010 +0000
+++ b/Makefile.am	Wed Feb 24 23:30:18 2010 +0000
@@ -194,6 +194,8 @@ endif
 # Sources list
 
 PLUGIN_TEST_SRCS = $(abs_top_srcdir)/plugin/tests/LiveConnect/*.java
+
+REWRITER_SRCS = $(abs_top_srcdir)/rewriter/com/redhat/rewriter/ClassRewriter.java
 
 # Patch list
 
@@ -439,7 +441,6 @@ ICEDTEA_ENV = \
 	JAVAC="" \
 	JAVA_HOME="" \
 	JDK_HOME="" \
-	RHINO_JAR="$(RHINO_JAR)" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
 	DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
 	DEBUG_CLASSFILES="true" \
@@ -475,6 +476,11 @@ if HAS_HOTSPOT_REVISION
 if HAS_HOTSPOT_REVISION
 ICEDTEA_ENV += \
 	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)" 
+endif
+
+if WITH_RHINO
+ICEDTEA_ENV += \
+	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
 endif
 
 # OpenJDK ecj build environment.
@@ -522,7 +528,6 @@ ICEDTEA_ENV_ECJ = \
 	JAVAC="" \
 	JAVA_HOME="" \
 	JDK_HOME="" \
-	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)" \
@@ -558,6 +563,11 @@ ICEDTEA_ENV_ECJ += \
 	HOTSPOT_BUILD_VERSION="$(HOTSPOT_REVISION)"
 endif
 
+if WITH_RHINO
+ICEDTEA_ENV_ECJ += \
+	RHINO_JAR="$(abs_top_builddir)/rhino/rhino.jar"
+endif
+
 # Source files
 # FIXME (distclean): Add generated file list
 # FIXME (distclean): Add jtreg sources
@@ -578,7 +588,10 @@ EXTRA_DIST = rt generated \
 	tapset/hotspot.stp.in \
 	tapset/hotspot_jni.stp.in \
 	scripts/jni_create_stap.c \
-	scripts/jni_desc
+	scripts/jni_desc \
+	rewriter/agpl-3.0.txt \
+	$(REWRITER_SRCS) \
+	THANKYOU
 
 # Top-Level Targets
 # =================
@@ -1219,7 +1232,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp
+	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1318,7 +1331,7 @@ stamps/icedtea-debug.stamp: stamps/boots
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
 	$(ICEDTEAPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
-	stamps/pulse-java.stamp
+	stamps/pulse-java.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
@@ -1440,7 +1453,7 @@ icedtea-debug-against-icedtea: \
 
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
-	stamps/patch-ecj.stamp stamps/cacao.stamp
+	stamps/patch-ecj.stamp stamps/cacao.stamp stamps/rewrite-rhino.stamp
 	$(ARCH_PREFIX) $(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
@@ -1695,6 +1708,40 @@ endif
 endif
 
 # end of pulse-java
+
+# Rhino support
+
+stamps/rewriter.stamp: $(INITIAL_BOOTSTRAP_LINK_STAMP)
+if WITH_RHINO
+	(cd $(abs_top_srcdir)/rewriter ; \
+	 $(ICEDTEA_BOOT_DIR)/bin/javac -g \
+	 -d $(abs_top_builddir)/rewriter $(REWRITER_SRCS) \
+	)
+endif
+	mkdir -p stamps
+	touch stamps/rewriter.stamp
+
+stamps/rewrite-rhino.stamp: stamps/rewriter.stamp $(RHINO_JAR)
+if WITH_RHINO
+	mkdir -p rhino/rhino.{old,new}
+	(cd rhino/rhino.old ; jar xf $(RHINO_JAR))
+	$(ICEDTEA_BOOT_DIR)/bin/java -cp $(abs_top_builddir)/rewriter \
+	  com.redhat.rewriter.ClassRewriter \
+	  $(abs_top_builddir)/rhino/rhino.old $(abs_top_builddir)/rhino/rhino.new \
+	  org.mozilla sun.org.mozilla
+	(cd rhino/rhino.old ; \
+	 for files in `find -type f -not -name '*.class'` ; do \
+	   new_file=../rhino.new/`echo $$files|sed -e 's#org#sun/org#'` ; \
+	   mkdir -p `dirname $$new_file` ; \
+	   cp -v $$files $$new_file ; \
+	   sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \
+	 done \
+	)
+	(cd rhino/rhino.new ; \
+	$(ICEDTEA_BOOT_DIR)/bin/jar cfm ../rhino.jar META-INF/MANIFEST.MF sun )
+endif
+	mkdir -p stamps
+	touch stamps/rewrite-rhino.stamp
 
 # VisualVM
 
@@ -2243,6 +2290,10 @@ patch-fsg: stamps/patch-fsg.stamp
 
 overlay: stamps/overlay.stamp
 
+rewriter: stamps/rewriter.stamp
+
+rewrite-rhino: stamps/rewrite-rhino.stamp
+
 plugs: stamps/plugs.stamp
 
 rt-class-files: stamps/rt-class-files.stamp
diff -r 398a7f03255b -r d6610428db7d acinclude.m4
--- a/acinclude.m4	Mon Jan 11 11:43:43 2010 +0000
+++ b/acinclude.m4	Wed Feb 24 23:30:18 2010 +0000
@@ -659,6 +659,10 @@ AC_DEFUN([FIND_RHINO_JAR],
   fi
   AC_MSG_RESULT(${RHINO_JAR})
   AM_CONDITIONAL(WITH_RHINO, test x"${RHINO_JAR}" != "xno")
+dnl Clear RHINO_JAR if it doesn't contain a valid filename
+  if test x"${RHINO_JAR}" = "xno"; then
+    RHINO_JAR=
+  fi
   AC_SUBST(RHINO_JAR)
 ])
 
diff -r 398a7f03255b -r d6610428db7d patches/icedtea-rhino.patch
--- a/patches/icedtea-rhino.patch	Mon Jan 11 11:43:43 2010 +0000
+++ b/patches/icedtea-rhino.patch	Wed Feb 24 23:30:18 2010 +0000
@@ -44,7 +44,7 @@
  	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
  	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
  	$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
-+	$(LN) -sf $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
++	$(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
  	@# Generate meta-index to make boot and extension class loaders lazier
  	$(CD) $(JRE_IMAGE_DIR)/lib && \
  	    $(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
@@ -55,7 +55,7 @@
  package com.sun.script.javascript;
  
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import javax.script.*;
  
  /**
@@ -66,7 +66,7 @@
  import javax.script.*;
  import java.util.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import com.sun.script.util.*;
  
  /**
@@ -77,7 +77,7 @@
  
  package com.sun.script.javascript;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import javax.script.*;
  import java.util.*;
  
@@ -88,7 +88,7 @@
  import com.sun.script.util.*;
  import javax.script.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import java.lang.reflect.Method;
  import java.io.*;
  import java.util.*;
@@ -99,7 +99,7 @@
  
  import java.util.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * This class prevents script access to certain sensitive classes.
@@ -110,7 +110,7 @@
  
  import javax.script.Invocable;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * This class implements Rhino-like JavaAdapter to help implement a Java
@@ -121,7 +121,7 @@
  package com.sun.script.javascript;
  
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  import java.util.*;
  
  /**
@@ -132,7 +132,7 @@
  import java.lang.reflect.*;
  import static sun.security.util.SecurityConstants.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * This wrap factory is used for security reasons. JSR 223 script
@@ -143,7 +143,7 @@
  package com.sun.script.javascript;
  import javax.script.*;
 -import sun.org.mozilla.javascript.internal.*;
-+import org.mozilla.javascript.*;
++import sun.org.mozilla.javascript.*;
  
  /**
   * Represents compiled JavaScript code.
diff -r 398a7f03255b -r d6610428db7d pulseaudio/AUTHORS
--- a/pulseaudio/AUTHORS	Mon Jan 11 11:43:43 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-Authors
-
-Ioana Iivan (iivan at redhat.com)
-
-Omair Majid (omajid at redhat.com)
\ No newline at end of file
diff -r 398a7f03255b -r d6610428db7d rewriter/agpl-3.0.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rewriter/agpl-3.0.txt	Wed Feb 24 23:30:18 2010 +0000
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.


From gnu_andrew at member.fsf.org  Fri Feb 26 06:27:30 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 14:27:30 +0000
Subject: Minor 1.7.1 Release
Message-ID: <17c6771e1002260627v3617b28bl58889a0e1e82e71e@mail.gmail.com>

Deepak and I have merged across a number of changesets to the 1.7
branch, providing plugin fixes, Zero/Shark fixes (as suggested by
Xerces) and the Rhino rewriter fix.
1.7 already includes Pavel's pulseaudio fix.

I'm now going to test and then roll out 1.7.1.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 xerxes at zafena.se  Fri Feb 26 06:47:43 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 26 Feb 2010 15:47:43 +0100
Subject: RFC [patch] Fix Shark NDEBUG build
Message-ID: <4B87DF0F.6030602@zafena.se>

When building shark against a LLVM release build this can occour:
g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32
-DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles
-I../generated/jvmtifiles
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/asm
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/c1
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/ci
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/classfile
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/code -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/compiler
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/g1
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parNew
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/shared
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_interface
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/interpreter
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/memory
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/oops -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/prims
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/runtime
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/services
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/utilities
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/cpu/zero/vm
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os/linux/vm
-I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os_cpu/linux_zero/vm
-I../generated -DHOTSPOT_RELEASE_VERSION="\"14.0-b16\""
-DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\""
-DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_17-b17\""
-DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6
1.7+r398a7f03255b\"" -DDISTRIBUTION_ID="\"Built on Ubuntu lucid
(development branch) (Fri Feb 26 15:26:43 CET 2010)\"" -DSHARK 
-I/usr/local/include -DNDEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
-D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti
-fno-exceptions -D_REENTRANT -fcheck-new -m32 -pipe -g -O3
-fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith
-Wsign-compare    -c -o sharkContext.o
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkContext.cpp

/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:
In member function 'void
SharkCompiler::generate_native_code(SharkEntry*, llvm::Function*, const
char*)':
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:254:
error: expected unqualified-id before ';' token
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:255:
error: 'DebugFlag' is not a member of 'llvm'
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:258:
error: expected unqualified-id before ';' token
/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:259:
error: 'DebugFlag' is not a member of 'llvm'

The attached patch fixes this issue:

    * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
    (SharkCompiler::generate_native_code): Undefine debug code for
NDEBUG builds

Ok to push?
Ok to push to icedtea6-1.7 release branch?
Cheers
Xerxes


-------------- next part --------------
A non-text attachment was scrubbed...
Name: shark_ndebug.patch
Type: text/x-diff
Size: 847 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100226/d6678c28/shark_ndebug.patch 

From xranby at icedtea.classpath.org  Fri Feb 26 06:56:06 2010
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 14:56:06 +0000
Subject: /hg/icedtea6: Undefine Shark debug code for NDEBUG builds
Message-ID: <hg.6731ec7aa417.1267196166.2873452341184383832@icedtea.classpath.org>

changeset 6731ec7aa417 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6731ec7aa417
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Feb 26 15:53:18 2010 +0100

	Undefine Shark debug code for NDEBUG builds

	2010-02-26 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::generate_native_code): Undefine debug code for
	NDEBUG builds


diffstat:

2 files changed, 8 insertions(+)
ChangeLog                                          |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    2 ++

diffs (32 lines):

diff -r b50fed90f978 -r 6731ec7aa417 ChangeLog
--- a/ChangeLog	Thu Feb 25 12:21:49 2010 +0000
+++ b/ChangeLog	Fri Feb 26 15:53:18 2010 +0100
@@ -1,3 +1,9 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-26  Xerxes R??nby  <xerxes at zafena.se>
+
+	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+	(SharkCompiler::generate_native_code): Undefine debug code for
+	NDEBUG builds
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add PULSE_JAVA_CLEAN_TARGET
diff -r b50fed90f978 -r 6731ec7aa417 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Thu Feb 25 12:21:49 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Feb 26 15:53:18 2010 +0100
@@ -250,6 +250,7 @@ void SharkCompiler::generate_native_code
 
     if (SharkPrintAsmOf != NULL) {
 #if SHARK_LLVM_VERSION >= 27
+#ifndef NDEBUG
       if (!fnmatch(SharkPrintAsmOf, name, 0)) {
         llvm::SetCurrentDebugType(X86_ONLY("x86-emitter") NOT_X86("jit"));
         llvm::DebugFlag = true;
@@ -258,6 +259,7 @@ void SharkCompiler::generate_native_code
         llvm::SetCurrentDebugType("");
         llvm::DebugFlag = false;
       }
+#endif
 #else
       // NB you need to patch LLVM with http://tinyurl.com/yf3baln for this
       std::vector<const char*> args;


From gnu_andrew at member.fsf.org  Fri Feb 26 06:56:54 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 14:56:54 +0000
Subject: RFC [patch] Fix Shark NDEBUG build
In-Reply-To: <4B87DF0F.6030602@zafena.se>
References: <4B87DF0F.6030602@zafena.se>
Message-ID: <17c6771e1002260656o3313144dw5f0a9780ab3f9857@mail.gmail.com>

On 26 February 2010 14:47, Xerxes R?nby <xerxes at zafena.se> wrote:
> When building shark against a LLVM release build this can occour:
> g++ -DLINUX -D_GNU_SOURCE -DCC_INTERP -DZERO -DIA32
> -DZERO_LIBARCH=\"i386\" -DPRODUCT -I. -I../generated/adfiles
> -I../generated/jvmtifiles
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/asm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/c1
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/ci
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/classfile
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/code -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/compiler
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parallelScavenge
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/concurrentMarkSweep
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/g1
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/parNew
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_implementation/shared
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/gc_interface
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/interpreter
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/memory
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/oops -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/prims
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/runtime
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/services
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/utilities
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/cpu/zero/vm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os/linux/vm
> -I/home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/os_cpu/linux_zero/vm
> -I../generated -DHOTSPOT_RELEASE_VERSION="\"14.0-b16\""
> -DHOTSPOT_BUILD_TARGET="\"product\"" -DHOTSPOT_BUILD_USER="\"xerxes\""
> -DHOTSPOT_LIB_ARCH=\"i386\" -DJRE_RELEASE_VERSION="\"1.6.0_17-b17\""
> -DHOTSPOT_VM_DISTRO="\"OpenJDK\"" -DDERIVATIVE_ID="\"IcedTea6
> 1.7+r398a7f03255b\"" -DDISTRIBUTION_ID="\"Built on Ubuntu lucid
> (development branch) (Fri Feb 26 15:26:43 CET 2010)\"" -DSHARK
> -I/usr/local/include -DNDEBUG -D_GNU_SOURCE -D__STDC_LIMIT_MACROS
> -D__STDC_CONSTANT_MACROS -DSHARK_LLVM_VERSION=27 -fpic -fno-rtti
> -fno-exceptions -D_REENTRANT -fcheck-new -m32 -pipe -g -O3
> -fno-strict-aliasing -DVM_LITTLE_ENDIAN -Werror -Wpointer-arith
> -Wsign-compare ? ?-c -o sharkContext.o
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkContext.cpp
>
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:
> In member function 'void
> SharkCompiler::generate_native_code(SharkEntry*, llvm::Function*, const
> char*)':
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:254:
> error: expected unqualified-id before ';' token
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:255:
> error: 'DebugFlag' is not a member of 'llvm'
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:258:
> error: expected unqualified-id before ';' token
> /home/xerxes/icedtea6-1.7-build-shark/openjdk/hotspot/src/share/vm/shark/sharkCompiler.cpp:259:
> error: 'DebugFlag' is not a member of 'llvm'
>
> The attached patch fixes this issue:
>
> ? ?* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
> ? ?(SharkCompiler::generate_native_code): Undefine debug code for
> NDEBUG builds
>
> Ok to push?
> Ok to push to icedtea6-1.7 release branch?
> Cheers
> Xerxes
>
>
>

Yes and yes.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 xranby at icedtea.classpath.org  Fri Feb 26 06:57:14 2010
From: xranby at icedtea.classpath.org (xranby at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 14:57:14 +0000
Subject: /hg/release/icedtea6-1.7: Undefine Shark debug code for NDEBUG b...
Message-ID: <hg.6dc81df0b056.1267196234.1785565629229908553@icedtea.classpath.org>

changeset 6dc81df0b056 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=6dc81df0b056
author: Xerxes R?nby <xerxes at zafena.se>
date: Fri Feb 26 15:54:29 2010 +0100

	Undefine Shark debug code for NDEBUG builds

	2010-02-26 Xerxes R?nby <xerxes at zafena.se>

	 * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
	(SharkCompiler::generate_native_code): Undefine debug code for
	NDEBUG builds


diffstat:

2 files changed, 8 insertions(+)
ChangeLog                                          |    6 ++++++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp |    2 ++

diffs (32 lines):

diff -r d6610428db7d -r 6dc81df0b056 ChangeLog
--- a/ChangeLog	Wed Feb 24 23:30:18 2010 +0000
+++ b/ChangeLog	Fri Feb 26 15:54:29 2010 +0100
@@ -1,3 +1,9 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-26  Xerxes R??nby  <xerxes at zafena.se>
+
+        * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
+        (SharkCompiler::generate_native_code): Undefine debug code for
+        NDEBUG builds
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am: Add THANKYOU to
diff -r d6610428db7d -r 6dc81df0b056 ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Wed Feb 24 23:30:18 2010 +0000
+++ b/ports/hotspot/src/share/vm/shark/sharkCompiler.cpp	Fri Feb 26 15:54:29 2010 +0100
@@ -250,6 +250,7 @@ void SharkCompiler::generate_native_code
 
     if (SharkPrintAsmOf != NULL) {
 #if SHARK_LLVM_VERSION >= 27
+#ifndef NDEBUG
       if (!fnmatch(SharkPrintAsmOf, name, 0)) {
         llvm::SetCurrentDebugType(X86_ONLY("x86-emitter") NOT_X86("jit"));
         llvm::DebugFlag = true;
@@ -258,6 +259,7 @@ void SharkCompiler::generate_native_code
         llvm::SetCurrentDebugType("");
         llvm::DebugFlag = false;
       }
+#endif
 #else
       // NB you need to patch LLVM with http://tinyurl.com/yf3baln for this
       std::vector<const char*> args;


From xerxes at zafena.se  Fri Feb 26 07:30:03 2010
From: xerxes at zafena.se (=?ISO-8859-1?Q?Xerxes_R=E5nby?=)
Date: Fri, 26 Feb 2010 16:30:03 +0100
Subject: RFInclusion into Icedtea6 1.7.1 Thumb2 JIT and ARM ASM bugfixes
Message-ID: <4B87E8FB.2090404@zafena.se>

Hi i suggest that we should add the ARM Thumb2 JIT and ARM ASM bugfixes
into the Icedtea6 1.7.1 release

http://icedtea.classpath.org/hg/icedtea6/rev/748156804502 - Make Thumb2
JIT the default build
http://icedtea.classpath.org/hg/icedtea6/rev/ba5d4644582d - Several bug
fixes to compiling methods with exception handlers
http://icedtea.classpath.org/hg/icedtea6/rev/ab2479dd2f87 - Various bug
fixes
http://icedtea.classpath.org/hg/icedtea6/rev/59e6d2d51c8e - Add
ports/hotspot/src/cpu/zero/vm/thumb2.cpp missed out in last commit
http://icedtea.classpath.org/hg/icedtea6/rev/b227a81ef16c - Added Thumb2
JIT + general tidying up
http://icedtea.classpath.org/hg/icedtea6/rev/be36bffde64d - Fix build
for hs16. Add implementation of is_allocatable

Ok to merge into Icedtea6 1.7.1?

Icedtea6 1.7 contains one fix that cant be found in the Icedtea6 trunk
http://icedtea.classpath.org/hg/release/icedtea6-1.7/rev/06d8ceaf70ff
Would this changeset cause any issues?
Should this changeset be transplanted to the Icedtea6 main branch?

Cheers
Xerxes


From gnu_andrew at member.fsf.org  Fri Feb 26 08:32:48 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 16:32:48 +0000
Subject: RFInclusion into Icedtea6 1.7.1 Thumb2 JIT and ARM ASM bugfixes
In-Reply-To: <4B87E8FB.2090404@zafena.se>
References: <4B87E8FB.2090404@zafena.se>
Message-ID: <17c6771e1002260832i514f12dcl22a88bbfd3d39a06@mail.gmail.com>

On 26 February 2010 15:30, Xerxes R?nby <xerxes at zafena.se> wrote:
> Hi i suggest that we should add the ARM Thumb2 JIT and ARM ASM bugfixes
> into the Icedtea6 1.7.1 release
>
> http://icedtea.classpath.org/hg/icedtea6/rev/748156804502 - Make Thumb2
> JIT the default build
> http://icedtea.classpath.org/hg/icedtea6/rev/ba5d4644582d - Several bug
> fixes to compiling methods with exception handlers
> http://icedtea.classpath.org/hg/icedtea6/rev/ab2479dd2f87 - Various bug
> fixes
> http://icedtea.classpath.org/hg/icedtea6/rev/59e6d2d51c8e - Add
> ports/hotspot/src/cpu/zero/vm/thumb2.cpp missed out in last commit
> http://icedtea.classpath.org/hg/icedtea6/rev/b227a81ef16c - Added Thumb2
> JIT + general tidying up
> http://icedtea.classpath.org/hg/icedtea6/rev/be36bffde64d - Fix build
> for hs16. Add implementation of is_allocatable
>
> Ok to merge into Icedtea6 1.7.1?
>
> Icedtea6 1.7 contains one fix that cant be found in the Icedtea6 trunk
> http://icedtea.classpath.org/hg/release/icedtea6-1.7/rev/06d8ceaf70ff
> Would this changeset cause any issues?
> Should this changeset be transplanted to the Icedtea6 main branch?
>
> Cheers
> Xerxes
>

I think we should let this soak on trunk and release it in 1.8 rather
than trying to backport it.  The minor releases are only for bug
fixes.

Thanks,
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 ptisnovs at icedtea.classpath.org  Fri Feb 26 08:37:13 2010
From: ptisnovs at icedtea.classpath.org (ptisnovs at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 16:37:13 +0000
Subject: /hg/icedtea6: Removed two unnecessary timezone patches
Message-ID: <hg.5216ec734960.1267202233.2873452341184383832@icedtea.classpath.org>

changeset 5216ec734960 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=5216ec734960
author: ptisnovs
date: Fri Feb 26 17:25:59 2010 +0100

	Removed two unnecessary timezone patches


diffstat:

3 files changed, 4 insertions(+), 220 deletions(-)
ChangeLog                                         |    4 
patches/icedtea-timezone-default-permission.patch |   23 --
patches/icedtea-timezone.patch                    |  197 ---------------------

diffs (239 lines):

diff -r 6731ec7aa417 -r 5216ec734960 ChangeLog
--- a/ChangeLog	Fri Feb 26 15:53:18 2010 +0100
+++ b/ChangeLog	Fri Feb 26 17:25:59 2010 +0100
@@ -1,3 +1,7 @@ 2010-02-26  Xerxes R??nby  <xerxes at zafen
+2010-02-26  Pavel Tisnovsky <ptisnovs at redhat.com>
+
+	* removed two unnecessary timezone patches
+
 2010-02-26  Xerxes R??nby  <xerxes at zafena.se>
 
 	* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
diff -r 6731ec7aa417 -r 5216ec734960 patches/icedtea-timezone-default-permission.patch
--- a/patches/icedtea-timezone-default-permission.patch	Fri Feb 26 15:53:18 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
---- openjdk7/jdk/src/share/classes/java/util/TimeZone.java	2009-08-04 18:54:13.026104895 +0200
-+++ openjdk/jdk/src/share/classes/java/util/TimeZone.java	2009-08-04 18:53:09.035985858 +0200
-@@ -602,11 +602,7 @@
-                 }
-             });
- 
--        if (hasPermission()) {
--            defaultTimeZone = tz;
--        } else {
--            defaultZoneTL.set(tz);
--        }
-+        defaultTimeZone = tz;
-         return tz;
-     }
- 
-@@ -637,6 +633,7 @@
-         if (hasPermission()) {
-             synchronized (TimeZone.class) {
-                 defaultTimeZone = zone;
-+                defaultZoneTL.set(null);
-             }
-         } else {
-             defaultZoneTL.set(zone);
diff -r 6731ec7aa417 -r 5216ec734960 patches/icedtea-timezone.patch
--- a/patches/icedtea-timezone.patch	Fri Feb 26 15:53:18 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
---- openjdk/jdk/src/solaris/native/java/util/TimeZone_md_old.c	2008-11-25 04:06:19.000000000 -0500
-+++ openjdk/jdk/src/solaris/native/java/util/TimeZone_md.c	2009-03-24 12:08:35.000000000 -0400
-@@ -201,115 +201,105 @@
-     size_t size;
- 
-     /*
--     * First, try the ZONE entry in /etc/sysconfig/clock. However, the
--     * ZONE entry is not set up after initial Red Hat Linux
--     * installation. In case that /etc/localtime is set up without
--     * using timeconfig, there might be inconsistency between
--     * /etc/localtime and the ZONE entry. The inconsistency between
--     * timeconfig and linuxconf is reported as a bug in the Red Hat
--     * web page as of May 1, 2000.
-+     * First, try /etc/localtime to find the zone ID.
-      */
--    if ((fp = fopen(sysconfig_clock_file, "r")) != NULL) {
--        char line[256];
--
--        while (fgets(line, sizeof(line), fp) != NULL) {
--            char *p = line;
--            char *s;
-+    if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
-+    
-+    	/* If /etc/localtime doesn't exist, try /etc/sysconfig/clock */
-+    	if ((fp = fopen(sysconfig_clock_file, "r")) != NULL) {
-+     	    char line[256];
-+
-+            while (fgets(line, sizeof(line), fp) != NULL) {
-+                char *p = line;
-+                char *s;
- 
--            SKIP_SPACE(p);
--            if (*p != 'Z') {
--                continue;
--            }
--            if (strncmp(p, "ZONE=\"", 6) == 0) {
--                p += 6;
--            } else {
--                /*
--                 * In case we need to parse it token by token.
--                 */
--                if (strncmp(p, "ZONE", 4) != 0) {
-+                SKIP_SPACE(p);
-+                if (*p != 'Z') {
-                     continue;
-                 }
--                p += 4;
--                SKIP_SPACE(p);
--                if (*p++ != '=') {
--                    break;
-+                if (strncmp(p, "ZONE=\"", 6) == 0) {
-+                    p += 6;
-+                } else {
-+                    /*
-+                     * In case we need to parse it token by token.
-+                     */
-+                    if (strncmp(p, "ZONE", 4) != 0) {
-+                        continue;
-+                    }
-+                    p += 4;
-+                    SKIP_SPACE(p);
-+                    if (*p++ != '=') {
-+                        break;
-+                    }
-+                    SKIP_SPACE(p);
-+                    if (*p++ != '"') {
-+                        break;
-+                    }
-                 }
--                SKIP_SPACE(p);
--                if (*p++ != '"') {
-+                for (s = p; *s && *s != '"'; s++)
-+                    ;
-+                if (*s != '"') {
-+                    /* this ZONE entry is broken. */
-                     break;
-                 }
--            }
--            for (s = p; *s && *s != '"'; s++)
--                ;
--            if (*s != '"') {
--                /* this ZONE entry is broken. */
-+                *s = '\0';
-+                tz = strdup(p);
-                 break;
-             }
--            *s = '\0';
--            tz = strdup(p);
--            break;
--        }
--        (void) fclose(fp);
--        if (tz != NULL) {
-+            (void) fclose(fp);
-             return tz;
-         }
--    }
-+    } else {
- 
--    /*
--     * Next, try /etc/localtime to find the zone ID.
--     */
--    if (lstat(defailt_zoneinfo_file, &statbuf) == -1) {
--        return NULL;
--    }
-+        /*
-+         * If it's a symlink, get the link name and its zone ID part. (The
-+         * older versions of timeconfig created a symlink as described in
-+         * the Red Hat man page. It was changed in 1999 to create a copy
-+         * of a zoneinfo file. It's no longer possible to get the zone ID
-+         * from /etc/localtime.)
-+         */
-+         if (S_ISLNK(statbuf.st_mode)) {
-+             char linkbuf[PATH_MAX+1];
-+             int len;
-+
-+             if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
-+                jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
-+                            defailt_zoneinfo_file);
-+                return NULL;
-+            }
-+            linkbuf[len] = '\0';
-+            tz = getZoneName(linkbuf);
-+            if (tz != NULL) {
-+                tz = strdup(tz);
-+            }
-+            return tz;
-+        }
- 
--    /*
--     * If it's a symlink, get the link name and its zone ID part. (The
--     * older versions of timeconfig created a symlink as described in
--     * the Red Hat man page. It was changed in 1999 to create a copy
--     * of a zoneinfo file. It's no longer possible to get the zone ID
--     * from /etc/localtime.)
--     */
--    if (S_ISLNK(statbuf.st_mode)) {
--        char linkbuf[PATH_MAX+1];
--        int len;
--
--        if ((len = readlink(defailt_zoneinfo_file, linkbuf, sizeof(linkbuf)-1)) == -1) {
--            jio_fprintf(stderr, (const char *) "can't get a symlink of %s\n",
--                        defailt_zoneinfo_file);
-+        /*
-+         * If it's a regular file, we need to find out the same zoneinfo file
-+         * that has been copied as /etc/localtime.
-+         */
-+         size = (size_t) statbuf.st_size;
-+         buf = (char *) malloc(size);
-+        if (buf == NULL) {
-             return NULL;
-         }
--        linkbuf[len] = '\0';
--        tz = getZoneName(linkbuf);
--        if (tz != NULL) {
--            tz = strdup(tz);
-+        if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
-+            free((void *) buf);
-+            return NULL;
-         }
--        return tz;
--    }
- 
--    /*
--     * If it's a regular file, we need to find out the same zoneinfo file
--     * that has been copied as /etc/localtime.
--     */
--    size = (size_t) statbuf.st_size;
--    buf = (char *) malloc(size);
--    if (buf == NULL) {
--        return NULL;
--    }
--    if ((fd = open(defailt_zoneinfo_file, O_RDONLY)) == -1) {
--        free((void *) buf);
--        return NULL;
--    }
--
--    if (read(fd, buf, size) != (ssize_t) size) {
-+        if (read(fd, buf, size) != (ssize_t) size) {
-+            (void) close(fd);
-+            free((void *) buf);
-+            return NULL;
-+        }
-         (void) close(fd);
-+
-+        tz = findZoneinfoFile(buf, size, zoneinfo_dir);
-         free((void *) buf);
--        return NULL;
-+        return tz;
-     }
--    (void) close(fd);
--
--    tz = findZoneinfoFile(buf, size, zoneinfo_dir);
--    free((void *) buf);
--    return tz;
- }
- #else
- #ifdef __solaris__


From andrew at icedtea.classpath.org  Fri Feb 26 09:45:47 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 17:45:47 +0000
Subject: /hg/release/icedtea6-1.7: Update NEWS and bump version for 1.7.1.
Message-ID: <hg.5a3838937f7c.1267206347.1785565629229908553@icedtea.classpath.org>

changeset 5a3838937f7c in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=5a3838937f7c
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 26 17:45:26 2010 +0000

	Update NEWS and bump version for 1.7.1.

	2010-02-26 Andrew John Hughes <ahughes at redhat.com>

	 * NEWS: Updated for 1.7.1
		* configure.ac: Bump version.


diffstat:

3 files changed, 51 insertions(+), 17 deletions(-)
ChangeLog    |   37 +++++++++++++++++++++----------------
NEWS         |   29 +++++++++++++++++++++++++++++
configure.ac |    2 +-

diffs (177 lines):

diff -r 6dc81df0b056 -r 5a3838937f7c ChangeLog
--- a/ChangeLog	Fri Feb 26 15:54:29 2010 +0100
+++ b/ChangeLog	Fri Feb 26 17:45:26 2010 +0000
@@ -1,3 +1,8 @@ 2010-02-26  Xerxes R??nby  <xerxes at zafen
+2010-02-26 Andrew John Hughes  <ahughes at redhat.com>
+
+	* NEWS: Updated for 1.7.1
+	* configure.ac: Bump version.
+
 2010-02-26  Xerxes R??nby  <xerxes at zafena.se>
 
         * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp
@@ -198,7 +203,7 @@ 2010-02-17  Xerxes R??nby  <xerxes at zafen
 	Allways define llvm/Support/CommandLine.h.
 
 2010-02-16  Gary Benson  <gbenson at redhat.com>
-	
+
 	* contrib/jck/compile-native-code.sh: Add s390.
 
 2010-02-15  Gary Benson  <gbenson at redhat.com>
@@ -282,13 +287,13 @@ 2010-01-27 Andrew John Hughes  <ahughes@
 	* Makefile.am: Reference plugin
 	directory by absolute path in EXTRA_DIST
 	to avoid confusion with build rule.
-	
+
 2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Updated for 1.7 release.
-	
+
 2010-01-27 Andrew John Hughes  <ahughes at redhat.com>
-	
+
 	* HACKING: Document new patch.
 	* Makefile.am: Add new patch.
 	* patches/libpng.patch:
@@ -301,11 +306,11 @@ 2010-01-27 Andrew John Hughes  <ahughes@
 	* NEWS:
 	Add missing items for 1.5.1, 1.5.2,
 	1.5.3, 1.6.1 and 1.6.2.
-	
+
 2010-01-27  Matthias Klose  <doko at ubuntu.com>
 
 	* Makefile.am: Remove quoting from ICEDTEA_NAME ICEDTEA_REV
-	ICEDTEA_PKG.  
+	ICEDTEA_PKG.
 
 2010-01-26 Andrew John Hughes  <ahughes at redhat.com>
 
@@ -342,37 +347,37 @@ 2010-01-25 Andrew John Hughes  <ahughes@
 	Fix ICEDTEAPLUGIN_TARGET to use new
 	stamp targets and remove redundant
 	ICEDTEANPPPLUGIN_TARGET.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Use NPPLUGIN_SRCDIR for Java plugin sources.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Build NPPlugin source files separately.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Provide stamp targets for both npplugin
 	and the old plugin so 'make plugin' builds
 	the one configured.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Remove trailing space after IcedTea version
 	in plugin version information when package
 	version is not set.
-	
+
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
 	Build NPPlugin in the build directory,
 	not the source tree.
-	
+
 2010-01-22  Deepak Bhole <dbhole at redhat.com>
 
 	* Makefile.am:
@@ -408,7 +413,7 @@ 2010-01-25 Andrew John Hughes  <ahughes@
 	* patches/icedtea-libraries.patch:
 	Make all dlopen choices at build-time,
 	not just one.  Support libjpeg8 as well.
-	
+
 2010-01-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR icedtea/433
@@ -426,7 +431,7 @@ 2010-01-21  Andrew John Hughes  <ahughes
 	* Makefile.am:
 	Fix paths to patches and IcedTeaNPPlugin.cc
 	for make dist.
-	
+
 2010-01-20  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
@@ -476,7 +481,7 @@ 2010-01-18 Andrew John Hughes  <ahughes@
 	Use $(OPENJDK_SRC_ZIP) and $(HOTSPOT_SRC_ZIP)
 	to determine names of tarballs rather than
 	hardcoding openjdk.tar.gz and hotspot.tar.gz
-	
+
 2010-01-17  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-sparc-trapsfix.patch: Merged sparc headers
@@ -494,7 +499,7 @@ 2010-01-16 Andrew John Hughes  <ahughes@
 	(IT_FIND_NUMBER_OF_PROCESSORS):
 	Dependency of above.  Uses getconf to
 	obtain the number of available processors.
-	
+
 2010-01-16 Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r 6dc81df0b056 -r 5a3838937f7c NEWS
--- a/NEWS	Fri Feb 26 15:54:29 2010 +0100
+++ b/NEWS	Fri Feb 26 17:45:26 2010 +0000
@@ -1,3 +1,32 @@ New in release 1.7 (2010-01-27):
+New in release 1.7 (2010-02-26):
+
+Bug fixes
+- PR179: Rhino bootclasspath issue
+- Add missing .c file to PulseAudio build
+Zero/Shark
+- Formatting changes and other fixes to match upstream
+- PR428: Shark on ARM precompiled header incls
+- Update Shark for LLVM r95390 API change.
+- S6927165: Zero S/390 fixes (from upstream)
+- Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.
+- Add s390 support to TCK setup helper script
+- Strip stupid options that llvm-config supplies
+- Update Shark for LLVM r94686 API change.
+- S6914622, S6909153, S6913869 upstream Zero fixes.
+NPPlugin fixes
+- PR446: Use JDK_UPDATE_VERSION to set the jpi version.
+- Re-designed frame embedding code so that the applet is dynamically
+  packed into given handle. This increases stability and breaks
+  reliance on the assumption that the browser will always provide a
+  handle in a certain sequence.
+- Encode new lines, carriage returns, and other special characters
+  before sending them to Java side (de-coding code is already in
+  effect on Java side).
+- Centralised and increased timeouts to give slow-loading applets
+  enough time to load.
+- Fix security permissions related to get/set property, based on
+  specifications.
+
 New in release 1.7 (2010-01-27):
 
 - Updated to OpenJDK6 b17.
diff -r 6dc81df0b056 -r 5a3838937f7c configure.ac
--- a/configure.ac	Fri Feb 26 15:54:29 2010 +0100
+++ b/configure.ac	Fri Feb 26 17:45:26 2010 +0000
@@ -1,4 +1,4 @@ AC_INIT([icedtea6], [1.7], [distro-pkg-d
-AC_INIT([icedtea6], [1.7], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6], [1.7.1], [distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 


From andrew at icedtea.classpath.org  Fri Feb 26 10:18:22 2010
From: andrew at icedtea.classpath.org (andrew at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 18:18:22 +0000
Subject: /hg/release/icedtea6-1.7: Added tag icedtea6-1.7.1 for changeset...
Message-ID: <hg.dbb5ddd34731.1267208302.1785565629229908553@icedtea.classpath.org>

changeset dbb5ddd34731 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=dbb5ddd34731
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Feb 26 18:03:04 2010 +0000

	Added tag icedtea6-1.7.1 for changeset 5a3838937f7c


diffstat:

1 file changed, 1 insertion(+)
.hgtags |    1 +

diffs (8 lines):

diff -r 5a3838937f7c -r dbb5ddd34731 .hgtags
--- a/.hgtags	Fri Feb 26 17:45:26 2010 +0000
+++ b/.hgtags	Fri Feb 26 18:03:04 2010 +0000
@@ -18,3 +18,4 @@ 9420faca6468e1c75e9bfa73b31246ba0b73a77d
 9420faca6468e1c75e9bfa73b31246ba0b73a77d icedtea-1.6-branchpoint
 8826d5735e2ca97ecdb35e7c977785d3e5b99556 icedtea6-1.7-branch
 4bfb7468a41eb089cac8dfb40fb6d79abe19db36 icedtea6-1.7
+5a3838937f7cc44c1d0fa2f778dbe1a8f5027bec icedtea6-1.7.1


From gnu_andrew at member.fsf.org  Fri Feb 26 10:21:52 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 18:21:52 +0000
Subject: IcedTea6 1.7.1 Released!
Message-ID: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>

We are pleased to announce the release of IcedTea6 1.7.1!

The IcedTea project provides a harness to build the source code from
OpenJDK6 using Free Software build tools. It also includes the only
Free Java plugin and Web Start implementation, and support for
additional architectures over and above x86, x86_64 and SPARC via the
Zero assembler port.

What's New?
==========

Bug fixes
- PR179: Rhino bootclasspath issue
- Add missing .c file to PulseAudio build
Zero/Shark
- Formatting changes and other fixes to match upstream
- PR428: Shark on ARM precompiled header incls
- Update Shark for LLVM r95390 API change.
- S6927165: Zero S/390 fixes (from upstream)
- Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.
- Add s390 support to TCK setup helper script
- Strip stupid options that llvm-config supplies
- Update Shark for LLVM r94686 API change.
- S6914622, S6909153, S6913869 upstream Zero fixes.
NPPlugin fixes
- PR446: Use JDK_UPDATE_VERSION to set the jpi version.
- Re-designed frame embedding code so that the applet is dynamically
  packed into given handle. This increases stability and breaks
  reliance on the assumption that the browser will always provide a
  handle in a certain sequence.
- Encode new lines, carriage returns, and other special characters
  before sending them to Java side (de-coding code is already in
  effect on Java side).
- Centralised and increased timeouts to give slow-loading applets
  enough time to load.
- Fix security permissions related to get/set property, based on
  specifications.

The tarball can be downloaded from:

* http://icedtea.classpath.org/download/source/icedtea6-1.7.1.tar.gz

The following people helped with the 1.7 release series:

Lillian Angel, Gary Benson, Deepak Bhole, Andrew Haley, Andrew John
Hughes, Nobuhiro Iwamatsu, Matthias Klose, Martin Matejovic, Edward Nevill,
Xerxes R?nby, Robert Schuster,Jon VanAlten, Mark Wielaard and Man Lung Wong.

We would also like to thank the bug reporters and testers!

To get started:
$ tar xzf icedtea6-1.7.1.tar.gz
$ cd icedtea6-1.7.1

Full build requirements and instructions are in INSTALL:
$ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java
--enable-systemtap ...]
$ make

Blog:

-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 Feb 26 10:22:36 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Fri, 26 Feb 2010 18:22:36 +0000
Subject: IcedTea6 1.7.1 Released!
In-Reply-To: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>
References: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>
Message-ID: <17c6771e1002261022g33fd4c33ne4ad207d93967dff@mail.gmail.com>

On 26 February 2010 18:21, Andrew John Hughes <gnu_andrew at member.fsf.org> wrote:
> We are pleased to announce the release of IcedTea6 1.7.1!
>
> The IcedTea project provides a harness to build the source code from
> OpenJDK6 using Free Software build tools. It also includes the only
> Free Java plugin and Web Start implementation, and support for
> additional architectures over and above x86, x86_64 and SPARC via the
> Zero assembler port.
>
> What's New?
> ==========
>
> Bug fixes
> - PR179: Rhino bootclasspath issue
> - Add missing .c file to PulseAudio build
> Zero/Shark
> - Formatting changes and other fixes to match upstream
> - PR428: Shark on ARM precompiled header incls
> - Update Shark for LLVM r95390 API change.
> - S6927165: Zero S/390 fixes (from upstream)
> - Implemented Shark host CPU feature autotuner using LLVM 2.7 APIs.
> - Add s390 support to TCK setup helper script
> - Strip stupid options that llvm-config supplies
> - Update Shark for LLVM r94686 API change.
> - S6914622, S6909153, S6913869 upstream Zero fixes.
> NPPlugin fixes
> - PR446: Use JDK_UPDATE_VERSION to set the jpi version.
> - Re-designed frame embedding code so that the applet is dynamically
> ?packed into given handle. This increases stability and breaks
> ?reliance on the assumption that the browser will always provide a
> ?handle in a certain sequence.
> - Encode new lines, carriage returns, and other special characters
> ?before sending them to Java side (de-coding code is already in
> ?effect on Java side).
> - Centralised and increased timeouts to give slow-loading applets
> ?enough time to load.
> - Fix security permissions related to get/set property, based on
> ?specifications.
>
> The tarball can be downloaded from:
>
> * http://icedtea.classpath.org/download/source/icedtea6-1.7.1.tar.gz
>
> The following people helped with the 1.7 release series:
>
> Lillian Angel, Gary Benson, Deepak Bhole, Andrew Haley, Andrew John
> Hughes, Nobuhiro Iwamatsu, Matthias Klose, Martin Matejovic, Edward Nevill,
> Xerxes R?nby, Robert Schuster,Jon VanAlten, Mark Wielaard and Man Lung Wong.
>
> We would also like to thank the bug reporters and testers!
>
> To get started:
> $ tar xzf icedtea6-1.7.1.tar.gz
> $ cd icedtea6-1.7.1
>
> Full build requirements and instructions are in INSTALL:
> $ ./configure [--enable-visualvm --with-openjdk --enable-pulse-java
> --enable-systemtap ...]
> $ make
>
> Blog:
>
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> 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
>

Blog: http://blog.fuseyism.com/index.php/2010/02/26/icedtea6-171-released/
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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 mjw at icedtea.classpath.org  Fri Feb 26 12:56:35 2010
From: mjw at icedtea.classpath.org (mjw at icedtea.classpath.org)
Date: Fri, 26 Feb 2010 20:56:35 +0000
Subject: /hg/icedtea6: Add 6928623-verbose-langtools.patch.
Message-ID: <hg.b849c299f6ff.1267217795.2873452341184383832@icedtea.classpath.org>

changeset b849c299f6ff in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b849c299f6ff
author: Mark Wielaard <mark at klomp.org>
date: Fri Feb 26 21:56:21 2010 +0100

	Add 6928623-verbose-langtools.patch.

	2010-02-26 Mark Wielaard <mark at klomp.org>

	 * patches/openjdk/6928623-verbose-langtools.patch: New
	patch.
		* Makefile.am (ICEDTEA_PATCHES): Add new patch.


diffstat:

3 files changed, 32 insertions(+), 2 deletions(-)
ChangeLog                                       |    5 +++++
Makefile.am                                     |    7 +++++--
patches/openjdk/6928623-verbose-langtools.patch |   22 ++++++++++++++++++++++

diffs (69 lines):

diff -r 5216ec734960 -r b849c299f6ff ChangeLog
--- a/ChangeLog	Fri Feb 26 17:25:59 2010 +0100
+++ b/ChangeLog	Fri Feb 26 21:56:21 2010 +0100
@@ -1,3 +1,8 @@ 2010-02-26  Pavel Tisnovsky <ptisnovs at re
+2010-02-26  Mark Wielaard  <mark at klomp.org>
+
+	* patches/openjdk/6928623-verbose-langtools.patch: New patch.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+
 2010-02-26  Pavel Tisnovsky <ptisnovs at redhat.com>
 
 	* removed two unnecessary timezone patches
diff -r 5216ec734960 -r b849c299f6ff Makefile.am
--- a/Makefile.am	Fri Feb 26 17:25:59 2010 +0100
+++ b/Makefile.am	Fri Feb 26 21:56:21 2010 +0100
@@ -307,6 +307,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-explicit-target-arch.patch \
 	patches/icedtea-gcc-stack-markings.patch \
 	patches/openjdk/6879689-hotspot_warning_fix.patch \
+	patches/openjdk/6928623-verbose-langtools.patch \
 	patches/icedtea-no-precompiled.patch \
 	patches/icedtea-linux-separate-debuginfo.patch \
 	patches/icedtea-parisc.patch \
@@ -449,7 +450,8 @@ ICEDTEA_ENV = \
 	DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
 	DEBUG_CLASSFILES="true" \
 	DEBUG_BINARIES="true" \
-	ALT_DROPS_DIR="$(abs_top_builddir)/drops"
+	ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
+	VERBOSE="$(VERBOSE)"
 
 if WITH_CACAO
 ICEDTEA_ENV += \
@@ -543,7 +545,8 @@ ICEDTEA_ENV_ECJ = \
 	DEBUG_BINARIES="true" \
 	DISABLE_NIMBUS="true" \
 	NO_DOCS="true" \
-	ALT_DROPS_DIR="$(abs_top_builddir)/drops"
+	ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
+	VERBOSE="$(VERBOSE)"
 
 if WITH_CACAO
 ICEDTEA_ENV_ECJ += \
diff -r 5216ec734960 -r b849c299f6ff patches/openjdk/6928623-verbose-langtools.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6928623-verbose-langtools.patch	Fri Feb 26 21:56:21 2010 +0100
@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User andrew
+# Date 1266874633 0
+# Node ID f25efdb55c998759ce2c1d8711011619455beaba
+# Parent a3be81d385ee94edb4bffed3436fc548d68423b4
+6928623: Behaviour of VERBOSE=true on langtools build
+Summary: VERBOSE=true causes -diagnostics to be passed to ant rather than -debug
+Reviewed-by: jjg
+
+--- openjdk/langtools/make/Makefile	Thu Feb 18 15:41:36 2010 -0800
++++ openjdk/langtools/make/Makefile	Mon Feb 22 21:37:13 2010 +0000
+@@ -70,7 +70,7 @@ endif
+ endif
+ 
+ ifdef VERBOSE
+-  ANT_OPTIONS += -verbose -diagnostics
++  ANT_OPTIONS += -verbose -debug
+ endif
+ 
+ ifdef JDK_VERSION
+


From mark at klomp.org  Fri Feb 26 12:59:53 2010
From: mark at klomp.org (Mark Wielaard)
Date: Fri, 26 Feb 2010 21:59:53 +0100
Subject: FYI: Backport langtools VERBOSE patch
Message-ID: <1267217993.2509.3.camel@hermans.wildebeest.org>

Hi,

This backports the langtools VERBOSE patch from Andrew Hughes to
icedtea6. With this you can now also do "make VERBOSE=true" and get lots
of extra build details. Which will hopefully help getting to the bottom
of some strange build failures in some esoteric environments.

2010-02-26  Mark Wielaard  <mark at klomp.org>

       * patches/openjdk/6928623-verbose-langtools.patch: New patch.
       * Makefile.am (ICEDTEA_PATCHES): Add new patch.

Cheers,

Mark


-------------- next part --------------
A non-text attachment was scrubbed...
Name: verbose-langtools.patch
Type: text/x-patch
Size: 1841 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100226/987963be/verbose-langtools.patch 

From doko at ubuntu.com  Sat Feb 27 08:49:43 2010
From: doko at ubuntu.com (Matthias Klose)
Date: Sat, 27 Feb 2010 17:49:43 +0100
Subject: icedtea6 build failures on alpha and armel using gcj
Message-ID: <4B894D27.5080804@ubuntu.com>

Building icedtea6 on alpha and armel using a two stage bootstrap fails with 
different errors. These are no new errors, just rechecked the two stage 
bootstrap, because the one stage build fails to build cacao after the b18 
update. On alpha:

mkdir -p lib/rt
/home/doko/openjdk/openjdk-6-6b18~pre1/build/bootstrap/jdk1.6.0/bin/javac  -g -d 
lib/rt \
           -source 1.5 \
           -sourcepath \
 
'openjdk/jdk/src/share/classes:openjdk/jdk/src/solaris/classes:openjdk/langtools/src/share/classes:openjdk/corba/src/share/classes:/home/doko/openjdk/openjdk-6-6b18~pre1/build/generated' 
\
           -classpath /usr/lib/jvm/java-gcj/jre/lib/rt.jar \
           -bootclasspath \'\' @rt-source-files.txt ;
incorrect classpath: ''
----------
1. ERROR in 
/home/doko/openjdk/openjdk-6-6b18~pre1/build/openjdk/jdk/src/share/classes/sun/misc/FloatConsts.java 
(at line 52)
         public static final float   MIN_NORMAL      = 1.17549435E-38f;
                                                       ^^^^^^^^^^^^^^^
The literal 1.17549435E-38f of type float is out of range
----------
1 problem (1 error)make[1]: *** [stamps/rt-class-files.stamp] Error 255


I vaguely remember we had a patch in the past to back out some of the constants 
stuff.


On armel:

touch stamps/rewriter.stamp
mkdir -p rhino/rhino.{old,new}
(cd rhino/rhino.old ; jar xf /usr/share/java/js.jar)
/home/packages/openjdk/openjdk-6-6b18~pre1/build/bootstrap/jdk1.6.0/bin/java -cp 
/home/packages/openjdk/openjdk-6-6b18~pre1/build/rewriter \
           com.redhat.rewriter.ClassRewriter \
           /home/packages/openjdk/openjdk-6-6b18~pre1/build/rhino/rhino.old 
/home/packages/openjdk/openjdk-6-6b18~pre1/build/rhino/rhino.new \
           org.mozilla sun.org.mozilla
Exception in thread "main" java.lang.ExceptionInInitializerError
    <<No stacktrace available>>
Caused by: java.lang.RuntimeException: java.lang.ArrayIndexOutOfBoundsException: 3
    <<No stacktrace available>>
Caused by: java.lang.ArrayIndexOutOfBoundsException: 3
    <<No stacktrace available>>
make[1]: *** [stamps/rewrite-rhino.stamp] Error 1
make[1]: Leaving directory `/home/packages/openjdk/openjdk-6-6b18~pre1/build'

This is reported as http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40860

   Matthias


From a.radke at arcor.de  Sun Feb 28 03:42:26 2010
From: a.radke at arcor.de (Andreas Radke)
Date: Sun, 28 Feb 2010 12:42:26 +0100
Subject: build issue: Ant related?
In-Reply-To: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>
References: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>
Message-ID: <20100228124226.2295c8c8@laptop64.home>

the new release fails here. Maybe it's our apache-ant update to 1.8.0? We haven't changed anything major since 1.7 release.

Sanity check passed.
/bin/mkdir -p /tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools
(cd  ./langtools/make && \
	 /usr/bin/make JDK_TOPDIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/jdk JDK_MAKE_SHARED_DIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/jdk/make/common/shared EXTERNALSANITYCONTROL=true TARGET_CLASS_VERSION=5 MILESTONE=fcs BUILD_NUMBER=b17 JDK_BUILD_NUMBER=b17 FULL_VERSION=1.6.0_17-b17 PREVIOUS_JDK_VERSION=1.6.0 JDK_VERSION=1.6.0_17 JDK_MKTG_VERSION=6u17 JDK_MAJOR_VERSION=1 JDK_MINOR_VERSION=6 JDK_MICRO_VERSION=0 ARCH_DATA_MODEL=64 COOKED_JDK_UPDATE_VERSION=170 COOKED_BUILD_NUMBER=17 ANT_HOME="/usr/share/java/apache-ant" ALT_OUTPUTDIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools ALT_BOOTDIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/bootstrap/jdk1.6.0 all)
make[2]: Entering directory `/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/langtools/make'
JAVA_HOME=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/bootstrap/jdk1.6.0
ANT_OPTS=-Djava.io.tmpdir='/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools/build/ant-tmp' /usr/share/java/apache-ant/bin/ant
-diagnostics
> /tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools/build/ant-diagnostics.log
> make[2]: *** [build] Error 1 make[2]: Leaving directory
> `/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/langtools/make'
> make[1]: *** [langtools-build] Fehler 2
make[1]: Leaving directory
`/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk' make: ***
[stamps/icedtea.stamp] Fehler 2 ==> FEHLER: Build fehlgeschlagen.
    Breche ab ...


I append the ant-diagnostics.log.

Any idea? 

-Andy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: ant-diagnostics.log
Type: text/x-log
Size: 3504 bytes
Desc: not available
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20100228/7c62c3c4/ant-diagnostics.log 

From a.radke at arcor.de  Sun Feb 28 04:01:54 2010
From: a.radke at arcor.de (Andreas Radke)
Date: Sun, 28 Feb 2010 13:01:54 +0100
Subject: build issue: Ant related?
In-Reply-To: <20100228124226.2295c8c8@laptop64.home>
References: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>
	<20100228124226.2295c8c8@laptop64.home>
Message-ID: <20100228130154.6eed72c2@laptop64.home>

former 1.7 release now also fails at the same point.

-Andy


From bugzilla-daemon at icedtea.classpath.org  Sun Feb 28 06:56:55 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 28 Feb 2010 14:56:55 +0000
Subject: [Bug 409] similar error observed here
Message-ID: <E1NlkZj-0006or-Vi@icedtea.classpath.org>

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


Frieder.Ferlemann at web.de changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |Frieder.Ferlemann at web.de
            Summary|additional info             |similar error observed here




------- Comment #6 from Frieder.Ferlemann at web.de  2010-02-28 14:56 -------
I get a similar error here. Using openSUSE 11.2 64bit, the application BT747,
librxtxSerial-2.2pre1.so (rxtx-2.1_CVS20090105-1.1). 
Installed from:
http://download.opensuse.org/repositories/Application:/Geo/openSUSE_11.2/

The error is reproducible by connecting a bt-747 (GPS data logger with a CP2102
USB to UART Bridge Controller) typing BT747 on the console and trying to
connect to port number 0.
(the application crashes immediately so probably anything with a CP2102 USB to
UART Bridge Controller should produce a similar result)

I'm inlining the console output here and attach the output of
.bt747/hs_err_pid14255.log to this report

Thanks,
Frieder

------------8<--------------------------------------
> BT747
Current path : /home/fe/.bt747                                                  
Key emulations:                                                                 
F1-F4 : HARD1 to HARD4
F5 : COMMAND
F6 : MENU
F7 : CALC
F8 : FIND
F9 : LAUNCH (HOME)
F10: KEYBOARD_ABC
F11: KEYBOARD_123
F12: ACTION (Center button press)

opening for read 5SW.pdb
#1 - dataPath
#2 - classpath
#3 - jar file
found in sun.net.www.protocol.jar.JarURLConnection$JarURLInputStream at 2f93c0cf

opening for read 5SW.pdb
#1 - dataPath
#2 - classpath
#3 - jar file
found in sun.net.www.protocol.jar.JarURLConnection$JarURLInputStream at 42bad8a8
RXTX Warning:  Removing stale lock file. /var/lock/LCK..ttyUSB0
#
# A fatal error has been detected by the Java Runtime Environment:
#
#  SIGSEGV (0xb) at pc=0x00007f89b2527c9d, pid=14255, tid=140229383223568
#
# JRE version: 6.0-b16
# Java VM: OpenJDK 64-Bit Server VM (14.0-b16 mixed mode linux-amd64 )
# Distribution: Custom build (Thu Nov 26 23:44:19 UTC 2009)
# Problematic frame:
# C  [librxtxSerial-2.2pre1.so+0x8c9d]  read_byte_array+0x3d
#
# An error report file with more information is saved as:
# /home/fe/.bt747/hs_err_pid14255.log
#
# If you would like to submit a bug report, please include
# instructions how to reproduce the bug and visit:
#   http://icedtea.classpath.org/bugzilla
# The crash happened outside the Java Virtual Machine in native code.
# See problematic frame for where to report the bug.
#
/usr/bin/BT747: Zeile 6: 14255 Abgebrochen             java -classpath
$JP/RXTXcomm.jar:$JP/Waba_only.jar:$JP/BT747.jar waba.applet.Applet /w 320 /h
320 /scale 1 /bpp 8 BT747


-- 
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 Feb 28 06:58:20 2010
From: bugzilla-daemon at icedtea.classpath.org (bugzilla-daemon at icedtea.classpath.org)
Date: Sun, 28 Feb 2010 14:58:20 +0000
Subject: [Bug 409] similar error observed here
Message-ID: <E1Nlkb6-0006pH-Lj@icedtea.classpath.org>

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





------- Comment #7 from Frieder.Ferlemann at web.de  2010-02-28 14:58 -------
Created an attachment (id=301)
 --> (http://icedtea.classpath.org/bugzilla/attachment.cgi?id=301&action=view)
Using openSUSE 11.2 64bit, the application BT747, librxtxSerial-2.2pre1.so
(rxtx-2.1_CVS20090105-1.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 gnu_andrew at member.fsf.org  Sun Feb 28 14:30:50 2010
From: gnu_andrew at member.fsf.org (Andrew John Hughes)
Date: Sun, 28 Feb 2010 22:30:50 +0000
Subject: build issue: Ant related?
In-Reply-To: <20100228124226.2295c8c8@laptop64.home>
References: <17c6771e1002261021te92d8bche06296ae17fb2281@mail.gmail.com>
	<20100228124226.2295c8c8@laptop64.home>
Message-ID: <17c6771e1002281430w6f642f0dp2593c76344b78a63@mail.gmail.com>

On 28 February 2010 11:42, Andreas Radke <a.radke at arcor.de> wrote:
> the new release fails here. Maybe it's our apache-ant update to 1.8.0? We haven't changed anything major since 1.7 release.
>
> Sanity check passed.
> /bin/mkdir -p /tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools
> (cd ?./langtools/make && \
> ? ? ? ? /usr/bin/make JDK_TOPDIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/jdk JDK_MAKE_SHARED_DIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/jdk/make/common/shared EXTERNALSANITYCONTROL=true TARGET_CLASS_VERSION=5 MILESTONE=fcs BUILD_NUMBER=b17 JDK_BUILD_NUMBER=b17 FULL_VERSION=1.6.0_17-b17 PREVIOUS_JDK_VERSION=1.6.0 JDK_VERSION=1.6.0_17 JDK_MKTG_VERSION=6u17 JDK_MAJOR_VERSION=1 JDK_MINOR_VERSION=6 JDK_MICRO_VERSION=0 ARCH_DATA_MODEL=64 COOKED_JDK_UPDATE_VERSION=170 COOKED_BUILD_NUMBER=17 ANT_HOME="/usr/share/java/apache-ant" ALT_OUTPUTDIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools ALT_BOOTDIR=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/bootstrap/jdk1.6.0 all)
> make[2]: Entering directory `/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/langtools/make'
> JAVA_HOME=/tmp/openjdk6/trunk/src/icedtea6-1.7.1/bootstrap/jdk1.6.0
> ANT_OPTS=-Djava.io.tmpdir='/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools/build/ant-tmp' /usr/share/java/apache-ant/bin/ant
> -diagnostics
>> /tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/build/linux-amd64/langtools/build/ant-diagnostics.log
>> make[2]: *** [build] Error 1 make[2]: Leaving directory
>> `/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk/langtools/make'
>> make[1]: *** [langtools-build] Fehler 2
> make[1]: Leaving directory
> `/tmp/openjdk6/trunk/src/icedtea6-1.7.1/openjdk' make: ***
> [stamps/icedtea.stamp] Fehler 2 ==> FEHLER: Build fehlgeschlagen.
> ? ?Breche ab ...
>
>
> I append the ant-diagnostics.log.
>
> Any idea?
>
> -Andy

It's OpenJDK that's failing due to your update to Ant.  You should use
the recommended version of Ant which is 1.7.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

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