# # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with # this work for additional information regarding copyright ownership. # The ASF licenses this file to You under the Apache License, Version 2.0 # (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # # http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. How to create and patch a new Tomcat fork: 1. Follow https://svn.apache.org/repos/asf/geronimo/external/branches/tomcat-archetype-7.0.x/README.txt to create an initial fork of certain Tomcat release tag 2. Have a revision history log of last Tomcat 7 fork. Strongly suggest to use git to view it 3. Check in the initial fork without any manual code change 4. Compile the fork project and fix any compilation issue if any, then check it in separately 5. Follow the revision log one by one to patch/merge into the new forked project. 5.1 Tomcat clustering code structure change Try to use merge command to make the patch work easier $ svn merge -r 1329533:1329534 https://svn.apache.org/repos/asf/geronimo/external/trunk/tomcat-parent-7.0.27 . 5.2 Rebrand Tomcat version information 5.3 Patch Geronimo-6295 and Geronimo-5622 5.4 r1371029 - it's already synced in 7.0.39 5.5 r1387332 - Apply optimization for XmlEscape function: https://issues.apache.org/bugzilla/show_bug.cgi?id=53867 is accepted by community, and included in 7.0.33 onwards, so no change to 7.0.39 fork 5.6 r1387334 - Apply optimization for JspContextWrapper: https://issues.apache.org/bugzilla/show_bug.cgi?id=53869 is modified by the community, and included in 7.0.36 onwards, so no change to 7.0.39 fork 5.7 r1387463 - Japser EL Resolver optimization - https://issues.apache.org/bugzilla/show_bug.cgi?id=53896 in 7.0.33 onwards, so no change to 7.0.39 fork 5.8 r1406742 - no need to create a new string object - https://issues.apache.org/bugzilla/show_bug.cgi?id=54017 in 7.0.33 onwards, so no change to 7.0.39 fork 5.9 r1408341 - GERONIMO-6404: Applied patch for CVE-2012-2733 in 7.0.28 onwards, so no change to 7.0.39 fork 5.10 r1408342 - GERONIMO-6404: Applied patch for CVE-2012-3439 in 7.0.30 onwards, so no change to 7.0.39 fork 5.11 r1419728 - Code generation error in jstl tagPlugin Out - https://issues.apache.org/bugzilla/show_bug.cgi?id=54011 in 7.0.33 onwards, so no change to 7.0.39 fork 5.12 r1419754 - No pageContext in tag files' generated java code when using JSTL tagplugin Set - https://issues.apache.org/bugzilla/show_bug.cgi?id=54012 in 7.0.33 onwards, so no change 5.13 r1419776 - Performance tuning solution for JspReader - https://issues.apache.org/bugzilla/show_bug.cgi?id=53713 in 7.0.31 onwards, so no change to 7.0.39 fork 5.14 r1432973 - NPE in tagPlugins:ForEach - https://issues.apache.org/bugzilla/show_bug.cgi?id=54242 in 7.0.35 onwards, so no change to 7.0.39 fork 5.15 r1432974 - Class cast exception in tagPlugin Set generated code - https://issues.apache.org/bugzilla/show_bug.cgi?id=54338 in 7.0.35 onwards, so no change to 7.0.39 fork 5.16 r1432975 - Configurable system level tagPlugins.xml - https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 in 7.0.35 onwards 5.17 r1432979 - NPE in BodyContentImpl - https://issues.apache.org/bugzilla/show_bug.cgi?id=54241 in 7.0.35 onwards 5.18 r1436570 - Fix a regression caused by the changes for https://issues.apache.org/bugzilla/show_bug.cgi?id=54240 that broke compilation with JspC already in 7.0.39 5.19 r1440176 - Apply optimization for JspContextWrapper: https://issues.apache.org/bugzilla/show_bug.cgi?id=53869 (updated patch) already in 7.0.39