geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Donald Woods <dwo...@apache.org>
Subject Re: Tomcat webdav issue and Geronimo 2.1
Date Mon, 17 Dec 2007 14:54:52 GMT
I have a 6.0.13 + Geronimo patches + WebDAV fix that is ready to build 
and upload to the repo if you want it....

-Donald

Joe Bohn wrote:
> 
> Grrrr .... It looks like the updated tomcat image does not work.  Some 
> TCK tests are failing.  I might have to revert this change.
> 
> I know that I ran the servlet tests locally prior to the checkin but I 
> must have been using a different tomcat instance than the one I built. I 
> just looked at the merge conflicts again from Tomcat and noticed one 
> small thing that didn't look right.  I fixed that but the tests are 
> still failing.
> 
> David Jencks - I might need your expert advice looking into the tomcat 
> changes and the TCK errors (see the tck list).  I'll check in my latest 
> updated Tomcat patch.
> 
> Joe
> 
> 
> 
> 
> Joe Bohn wrote:
> 
>>
>> I just checked in this upgrade in 
>> http://svn.apache.org/viewvc?rev=603398&view=rev
>>
>> I hope it works (some quick testing looks promising).
>>
>> After digging into this now for tomcat 6.0.14 I can safely say that we 
>> really need to come up with a better way.  IMO we need to get Tomcat 
>> to integrate these annotation changes soon or revert back to using the 
>> native Tomcat mechanisms to support annotations.  At the moment Tomcat 
>> still has the annotation changes sitting in their sandbox and the code 
>> in their new trunk is drifting.
>>
>> Here are steps that I followed to create the patch to save the manual 
>> changes that were necessary so that we can recreate the tomcat image.  
>> I checked these directions in as 
>> repository/org/apache/tomcat/6.0.14-G602188.README.TXT
>>
>>
>> Private Build of Tomcat for 
>> Geronimo.                                       How to build Tomcat 
>> 6_0_14 with modifications for Geronimo:
>>
>> Checkout tomcat 6.0.14
>>   svn co 
>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14 
>> tomcat_6_0_14
>>
>> Apply the custom patch for Geronimo Annotation changes, Webdav fix, 
>> and build fix.
>>   cd tomcat_6_0_14
>>   patch -p0 -u < tomcat_6_0_14-G602188.patch   (checked in as a peer 
>> to this file)
>>   -  Respond "y" to the 3 prompts "Reversed (or previously applied) 
>> patch detected!  Assume -R? [n]"
>>   svn delete java/org/apache/jasper/runtime/AnnotationHelper.java --force
>>   svn delete java/org/apache/AnnotationProcessor.java --force
>>   svn delete 
>> java/org/apache/catalina/util/DefaultAnnotationProcessor.java --force
>>
>> Build tomcat
>>   cd tomcat_6_0_14
>>   Per tomcat build instructions install ant-1.6.5 or later and set 
>> ANT_HOME as well as add ant/bin to PATH
>>   You must run as the super user for the first build that downloads 
>> more ant & eclipse artifacts
>>   ant download   - to setup build for tomcat
>>   Exit super user
>>   ant - to build tomcat artifacts
>>
>> Copy to appropriate jars and rename into geronimo/repository
>>   cd tomcat_6_0_14
>>   cp /build/lib/catalina.jar 
>> <geronimo-root>/repository/org/apache/tomcat/catalina/6.0.14-G602188/catalina-6.0.14-G602188.jar

>>
>>   cp /build/lib/jasper.jar 
>> <geronimo-root>/repository/org/apache/tomcat/jasper/6.0.14-G602188/jasper-6.0.14-G602188.jar

>>
>>
>>
>>
>>
>>
>>
>>
>> How the patch was created:
>>
>> Checkout tomcat 6.0.14
>>   svn co 
>> https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14 
>> tomcat_6_0_14
>>
>>
>> Apply annotation changes from old tomcat trunk
>>   cd tomcat_6_0_14
>>   svn merge -r 542188:542189 
>> https://svn.apache.org/repos/asf/tomcat/sandbox/gdev6x/ .
>>   manually correct merge conflicts
>>
>> Apply the Webdav security fix from the new tomcat trunk
>>   svn merge -r 587081:587082 
>> https://svn.apache.org/repos/asf/tomcat/trunk/ .
>>   manually correct merge conflicts
>>
>> Fix the tomcat build properties before attempting "ant download"
>>   - Before you can build tomcat you need to make some manual changes 
>> to build.properties.default
>>   - replace jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.2.3.v_686_R32x.jar
>>     with jdt.jar=${jdt.lib}/org.eclipse.jdt.core_3.3.1.v_780_R33x.jar
>>   and
>>   - replace 
>> jdt.loc=http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-JDT-3.2.2.zip

>>
>>     with 
>> jdt.loc=http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.3.1-200709211145/eclipse-JDT-3.3.1.zip

>>
>>
>> The merge earlier keeps a history on added parts.  As a result, the 
>> added parts will not appear on patch created from this image.  To correct
>> this we must revert the addition changes and manually add the parts 
>> back.  Perform the following commands:
>>   svn revert java/org/apache/InstanceManager.java
>>   svn add    java/org/apache/InstanceManager.java
>>   svn revert java/org/apache/jasper/runtime/InstanceManagerFactory.java
>>   snv add    java/org/apache/jasper/runtime/InstanceManagerFactory.java
>>   svn revert java/org/apache/catalina/deploy/InjectionTarget.java
>>   snv add    java/org/apache/catalina/deploy/InjectionTarget.java
>>
>> Create the patch:
>>   svn diff > TOMCAT_6_0_14-G602188.patch
>>
> 

Mime
View raw message