Re: svn commit: r790742 [1/2] - in /geronimo/external/trunk/tomcat-parent-6.0.20: ./ catalina-ha/src/main/java/org/apache/catalina/ha/ catalina/src/main/java/org/apache/catalina/ catalina/src/main/java/org/apache/catalina/core/ catalina/src/main/java/org/a...

[Kevan Miller <ke...@gmail.com>]

On Jul 2, 2009, at 5:41 PM, kevan@apache.org wrote:

> Author: kevan
> Date: Thu Jul  2 21:41:08 2009
> New Revision: 790742
>
> URL: http://svn.apache.org/viewvc?rev=790742&view=rev
> Log:
> GERONIMO-4685 Merge of Tomcat patches from 6.0.18 to 6.0.20. This  
> includes revision numbers 784303 and 784304. Does not include  
> 787519, which should already be in 6.0.20

This builds for me. However, Geronimo build is currently running into  
a test failure. The fix for that is already in Tomcat trunk. So, not  
likely to require a merge if/when we move to 6.0.22.

Here's how I merged from 6.0.18:

cd tomcat-parent-6.0.20
svn merge -c 784303 ../tomcat-parent-6.0.18 .

I encountered the following problems

1) Conflict discovered in 'catalina/src/main/java/org/apache/catalina/ 
core/StandardWrapper.java'.
    Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options:

My response:   tc

2) Conflict discovered in 'catalina/src/main/java/org/apache/catalina/ 
core/StandardContext.java'.
    Select: (p) postpone, (df) diff-full, (e) edit,
            (mc) mine-conflict, (tc) theirs-conflict,
            (s) show all options:

My response:   tc

3) Merge conflict:   C catalina/src/main/java/org/apache/catalina/core/ 
mbeans-descriptors.xml

    After merge completed, I manually merged changes into catalina/src/ 
main/resources/org/apache/catalina/core/mbeans-descriptors.xml

4) Merge conflict:   C catalina/src/main/java/org/apache/catalina/util/ 
DefaultAnnotationProcessor.java

    After merge completed, I ran 'svn rm catalina/src/main/java/org/ 
apache/catalina/util/DefaultAnnotationProcessor.java'

5) Compile error in catalina/src/main/java/org/apache/catalina/core/ 
StandardWrapper.java

    Added import java.util.concurrent.atomic.AtomicInteger;

svn merge -c 784304 ../tomcat-parent-6.0.18 .

I did not merge 787519. It should already be in 6.0.20.

If this needs to be merged into a 6.0.22, the following command should  
work (once the initial 6.0.22 branch has been created):

cd tomcat-parent-6.0.22
svn merge -c 790742 ../tomcat-parent-6.0.18 .

--kevan