OpenJDK 6 build 12 source posted (corba, jaxp, jaxws)

[Joseph D. Darcy]

Mark Wielaard wrote:
> Hi Joe,
>
> On Mon, 2008-09-15 at 23:29 -0700, Joseph D. Darcy wrote:
>   
>>> Yes, nuking those CVS $Ids was on my possible to-do list before the 
>>> OpenJDK 6 Mercurial transition.  We'll also renormalize the whitespace 
>>> in all the sources before switching to Hg.
>>>       
>> PS A patch to remove the $Id's would be welcome :-)
>>     
>
> Since most of this is in upstream code how do you handle that?
>   

Not particularly well ;-)

> In GNU Classpath we keep such code separate (in an external dir, where
> there is an README explaining how to do a fresh import) and have the
> rule that changes should be pushed upstream before applying/reimporting.
>
> Which version/branch of the upstream code do you use and how do patches
> flow back and forth between the projects normally?
>
> In the case of CVS $Id's of course another option is to import them
> without keyword expansion to keep divergence as small as possible.
>
>   

In the JDK, we import some large bodies of code that are actively 
maintained elsewhere, such as the GlassFish project.  This is generally 
a copy-and-paste of the upstream code, with perhaps some local fixes or 
licensing changes.  This approach has the attendant code maintenance 
issues and in the future I'd like to revisit how we interact with these 
other code bases; the approach of just having the code as a build 
dependency and keeping local patches under revision control, as done in 
IcedTea, might be better overall.

-Joe