geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r603398 [1/3] - in /geronimo/server/trunk: ./ repository/org/apache/tomcat/ repository/org/apache/tomcat/catalina/6.0-TC543661/ repository/org/apache/tomcat/catalina/6.0.14-G602188/ repository/org/apache/tomcat/jasper/6.0-TC543661/ reposito...
Date Tue, 11 Dec 2007 22:45:00 GMT
Author: jbohn
Date: Tue Dec 11 14:44:52 2007
New Revision: 603398

URL: http://svn.apache.org/viewvc?rev=603398&view=rev
Log:
GERONIMO-3701 Update Tomcat to 6.0.14 including the annotation changes, webdav security fix,
and removing some really old tomcat images in the geronimo repo.

Added:
    geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G602188.README.TXT
    geronimo/server/trunk/repository/org/apache/tomcat/TOMCAT_6_0_14-G602188.patch
    geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G602188/
    geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0.14-G602188/catalina-6.0.14-G602188.jar
  (with props)
    geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G602188/
    geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0.14-G602188/jasper-6.0.14-G602188.jar
  (with props)
Removed:
    geronimo/server/trunk/repository/org/apache/tomcat/catalina/6.0-TC543661/
    geronimo/server/trunk/repository/org/apache/tomcat/jasper/6.0-TC543661/
Modified:
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=603398&r1=603397&r2=603398&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Dec 11 14:44:52 2007
@@ -76,7 +76,7 @@
         <!--
         HACK: Used by jsp and servlet example configs to point to the tomcat deployer
         -->
-        <tomcatVersion>6.0.13</tomcatVersion>
+        <tomcatVersion>6.0.14</tomcatVersion>
 
         <!--
         HACK: Used by uddi-jetty and uddi-tomcat config plans
@@ -950,7 +950,7 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>jasper</artifactId>
-                <version>6.0.13-G543818</version>
+                <version>6.0.14-G602188</version>
             </dependency>
 
             <dependency>
@@ -980,7 +980,7 @@
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>catalina</artifactId>
-                <version>6.0.13-G543818</version>
+                <version>6.0.14-G602188</version>
             </dependency>
 
             <dependency>
@@ -1910,7 +1910,7 @@
                         <dependency>
                             <groupId>org.apache.tomcat</groupId>
                             <artifactId>jasper</artifactId>
-                            <version>6.0.13-G543818</version>
+                            <version>6.0.14-G602188</version>
                         </dependency>
                     </dependencies>
                 </plugin>

Added: geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G602188.README.TXT
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G602188.README.TXT?rev=603398&view=auto
==============================================================================
--- geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G602188.README.TXT (added)
+++ geronimo/server/trunk/repository/org/apache/tomcat/6.0.14-G602188.README.TXT Tue Dec 11
14:44:52 2007
@@ -0,0 +1,86 @@
+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: 602188
+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-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