| ================================================================================ |
| 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. |
| ================================================================================ |
| |
| Apache Tomcat re-uses code from a number of other Apache projects. There are |
| several reasons why depending on the binary releases of those projects is not |
| ideal. These include: |
| - potential conflicts if a web application ships with the same JAR |
| - a large JAR where Tomcat only depends on a small fraction |
| |
| |
| SVN |
| === |
| |
| For sources hosted in svn the approach is to svn copy the classes to the Tomcat |
| source tree, modify them (always with a package rename, sometimes with |
| additional changes) and then keep them in sync with the original via regular svn |
| merges. This file keeps track of these copies to assist committers in keeping |
| them up to date. |
| |
| BCEL |
| ---- |
| org.apache.tomcat.util.bcel is copied from: |
| /commons/proper/bcel/trunk/src/main/java/org/apache/bcel |
| |
| Codec |
| ----- |
| org.apache.tomcat.util.codec is copied from: |
| /commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/ |
| Note: Only classes required for Base64 encoding/decoding. The rest are removed. |
| |
| |
| GIT |
| === |
| |
| Updates from Git are applied manually via patch files. Patch files are generated |
| using: |
| git diff <last SHA1>:<sub-tree> HEAD:<sub-tree> > temp.patch |
| The more recently merged SHA1 for the component below should be updated after |
| the patch file has been applied and committed |
| |
| FileUpload |
| ---------- |
| Sub-tree: |
| src/main/java/org/apache/commons/fileupload |
| The SHA1 ID for the most recent commit to be merged to Tomcat is: |
| 6c00d575a9521c386743891fd34bc5181174cc01 |
| |
| Note: Tomcat's copy of fileupload also includes classes copied manually (rather |
| than svn copied) from Commons IO. |
| |
| DBCP |
| ---- |
| DBCP2 |
| Sub-tree |
| src/main/java/org/apache/commons/dbcp2 |
| src/main/resources/org/apache/commons/dbcp2 |
| The SHA1 ID for the most recent commit to be merged to Tomcat is: |
| d7aa662fbbb99e536ae28c47d0c4e1d51e39d5b9 |
| |
| Pool2 |
| Sub-tree |
| src/main/java/org/apache/commons/pool2 |
| The SHA1 ID for the most recent commit to be merged to Tomcat is: |
| dfef97be70e8b1c3edb44b972fc7f700f3fe6255 |