<> is Java 7 only 

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1456964 13f79535-47bb-0310-9956-ffa450edef68
Diff trunk and 7.0.x and apply missing updates to 7.0.x

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1456968 13f79535-47bb-0310-9956-ffa450edef68
Update to Commons IO 2.4 and run UCDetector over the copied classes

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1456969 13f79535-47bb-0310-9956-ffa450edef68
Expose new rotate method via JMX

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1456971 13f79535-47bb-0310-9956-ffa450edef68
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54702
Merged revision 1456959 from tomcat/trunk:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54702
Close the stream at the end of the parse operation.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1456982 13f79535-47bb-0310-9956-ffa450edef68