Author: kkolinko
Date: Sat Mar 23 13:26:36 2013
New Revision: 1460140
URL: http://svn.apache.org/r1460140
Log:
Update the doc, as Apache Commons Codec classes were added in r1459218
Modified:
tomcat/trunk/SVN-MERGE.txt (contents, props changed)
Modified: tomcat/trunk/SVN-MERGE.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/SVN-MERGE.txt?rev=1460140&r1=1460139&r2=1460140&view=diff
==============================================================================
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/SVN-MERGE.txt Sat Mar 23 13:26:36 2013
@@ -15,7 +15,7 @@
limitations under the License.
================================================================================
-$Id: $
+$Id$
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
@@ -38,10 +38,14 @@ org.apache.tomcat.dbcp is generated by t
Commons Pool.
FileUpload
-org.apache.tomcat.util.http.fileupload is coppied from:
+org.apache.tomcat.util.http.fileupload is copied from:
/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload
Note: Tomcat's copy of fileupload also includes classes copied manually (rather
than svn copied) from Commons IO.
+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.
Propchange: tomcat/trunk/SVN-MERGE.txt
------------------------------------------------------------------------------
svn:keywords = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
