Jay,
Did you miss the new patch file when you checked this in? Actually,
would it be possible to create just one patch file that includes all the
changes in your tomcat source image and check that in? That way we only
need to apply one patch to recreate the image and all of the revision #s
would be consistent (and we could delete all of the 604245 items).
Thanks,
Joe
[EMAIL PROTECTED] wrote:
Author: jaydm
Date: Wed Jan 23 16:31:35 2008
New Revision: 614754
URL: http://svn.apache.org/viewvc?rev=614754&view=rev
Log:
GERONIMO-3451 - Use a new snapshot of tomcat
Includes security fix for webdav as well as 'restricted listeners' message
Added:
geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G614585.README.TXT
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G614585/
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G614585/catalina-6.0.14-G614585.jar
(with props)
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G614585/
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G614585/jasper-6.0.14-G614585.jar
(with props)
Modified:
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=614754&r1=614753&r2=614754&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Jan 23 16:31:35 2008
@@ -984,7 +984,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.14-G604245</version>
+ <version>6.0.14-G614585</version>
</dependency>
<dependency>
@@ -1014,7 +1014,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.14-G604245</version>
+ <version>6.0.14-G614585</version>
</dependency>
<dependency>
@@ -1950,7 +1950,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>jasper</artifactId>
- <version>6.0.14-G604245</version>
+ <version>6.0.14-G614585</version>
</dependency>
</dependencies>
</plugin>
Added:
geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G614585.README.TXT
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G614585.README.TXT?rev=614754&view=auto
==============================================================================
---
geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G614585.README.TXT
(added)
+++
geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G614585.README.TXT
Wed Jan 23 16:31:35 2008
@@ -0,0 +1,87 @@
+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
+
+svn info for Tomcat image:
+Path: .
+URL: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/tags/TOMCAT_6_0_14
+Repository Root: https://svn.apache.org/repos/asf
+Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
+Revision: 604245
+Node Kind: directory
+Schedule: normal
+Last Changed Author: remm
+Last Changed Rev: 557842
+Last Changed Date: 2007-07-19 21:43:38 -0400 (Thu, 19 Jul 2007)
+Properties Last Updated: 2007-12-07 14:29:52 -0500 (Fri, 07 Dec 2007)
+
+
+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-G604245.patch (checked in as a peer to this
file)
+ - Respond "y" to the 3 prompts "Reversed (or previously applied) patch detected!
Assume -R? [n]"
+
+Force delete these three files
+ 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
+
+Apply the 'restricted listeners' patch provided by djencks (already merged
into Tomcat trunk)
+ patch -p0 -u < tomcat_6_0_14-G614585.patch (cheked in as a peer to this
file)
+
+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 output/build/lib/catalina.jar
<geronimo-root>/repository/org/apache/tomcat/catalina/6.0.14-G614585/catalina-6.0.14-G614585.jar
+ cp output/build/lib/jasper.jar
<geronimo-root>/repository/org/apache/tomcat/jasper/6.0.14-G614585/jasper-6.0.14-G614585.jar
+
+
+
+How the patch was created (tomcat_6_0_14-G604245.patch):
+
+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
+
+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
+ svn add java/org/apache/jasper/runtime/InstanceManagerFactory.java
+ svn revert java/org/apache/catalina/deploy/InjectionTarget.java
+ svn add java/org/apache/catalina/deploy/InjectionTarget.java
+
+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
+
+Create the patch:
+ svn diff > TOMCAT_6_0_14-G604245.patch
+
+
+
+
Added:
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G614585/catalina-6.0.14-G614585.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G614585/catalina-6.0.14-G614585.jar?rev=614754&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G614585/catalina-6.0.14-G614585.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G614585/jasper-6.0.14-G614585.jar
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G614585/jasper-6.0.14-G614585.jar?rev=614754&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G614585/jasper-6.0.14-G614585.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
