conf/server.xml | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 [patch] set utf-8 as default character encoding

conf/server.xml | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 [patch] do not load ajp13 connector by default

conf/server.xml | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 [patch] disable apr library loading

    ... until we properly provide it.

build.xml | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 [patch] split deploy-webapps target from deploy target

conf/catalina.properties | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 [patch] add jars below /var to class loader

bin/catalina.sh | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

 [patch] use java.security.policy file in catalina.sh

Make sure catalina.sh uses the Debian/Ubuntu java.security.policy
file location when Tomcat is started with a security manager.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/591802
Bug-Debian: http://bugs.debian.org/585379

build.xml | 4 3 + 1 - 0 !
1 file changed, 3 insertions(+), 1 deletion(-)

 disable usage of embedded library copies

build.xml | 18 8 + 10 - 0 !
res/META-INF/jasper.jar.manifest | 10 10 + 0 - 0 !
2 files changed, 18 insertions(+), 10 deletions(-)

 fix codeless-jar and missing-classpath lintian warnings

modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java | 6 5 + 1 - 0 !
1 file changed, 5 insertions(+), 1 deletion(-)

 compatibility patch to support compilation of tomcat7
 using openjdk-7

build.xml | 1 0 + 1 - 0 !
1 file changed, 1 deletion(-)

 0013-dont-look-for-build-properties-in-user-home

test/org/apache/catalina/comet/TestCometProcessor.java | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

---

java/org/apache/naming/factory/Constants.java | 2 1 + 1 - 0 !
webapps/docs/config/systemprops.xml | 2 1 + 1 - 0 !
webapps/docs/jndi-resources-howto.xml | 2 1 + 1 - 0 !
3 files changed, 3 insertions(+), 3 deletions(-)

 make jdbc-pool module default
 Tomcat upstream ships a patched version of Commons DBCP. This is
 not shipped in the Debian packages.
 .
 It also provides an alternative, lightweight pool implementation
 which is shipped.
 .
 This patch makes this implementation the default pool.

conf/catalina.policy | 4 2 + 2 - 0 !
webapps/docs/manager-howto.xml | 2 1 + 1 - 0 !
webapps/host-manager/manager.xml | 2 1 + 1 - 0 !
3 files changed, 4 insertions(+), 4 deletions(-)

 this patch changes the manager path from webapps/manager to
../tomcat7-admin/manager

build.xml | 1 1 + 0 - 0 !
java/org/apache/catalina/util/ServerInfo.properties | 4 2 + 2 - 0 !
2 files changed, 3 insertions(+), 2 deletions(-)

---

java/org/apache/tomcat/SimpleInstanceManager.java | 68 68 + 0 - 0 !
1 file changed, 68 insertions(+)

 add the simpleinstancemanager class from tomcat 8 to help integrating the jsp compiler into jetty 8

test/org/apache/tomcat/util/net/TestCustomSsl.java | 2 1 + 1 - 0 !
test/org/apache/tomcat/util/net/TesterSupport.java | 22 16 + 6 - 0 !
2 files changed, 17 insertions(+), 7 deletions(-)

 uses updated test certificates to avoid a build failure when the tests are enabled.
 The updated keystores were taken from Tomcat 7.0.39 (http://svn.apache.org/r1451105)

test/org/apache/catalina/session/TestStandardSession.java | 1 1 + 0 - 0 !
test/org/apache/catalina/session/TestStandardSessionIntegration.java | 1 1 + 0 - 0 !
test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java | 183 0 + 183 - 0 !
test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java | 186 0 + 186 - 0 !
test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java | 7 4 + 3 - 0 !
test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java | 129 0 + 129 - 0 !
test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java | 131 0 + 131 - 0 !
test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java | 197 0 + 197 - 0 !
test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java | 177 0 + 177 - 0 !
test/org/apache/catalina/tribes/test/TribesTestSuite.java | 20 10 + 10 - 0 !
10 files changed, 16 insertions(+), 1016 deletions(-)

 disable unit tests that depends on network access
 After fixing a FTBFS bug (#789519), I noticed this package kept
 failing to build due to some failing test when is built in an
 environment without network access.
 tomcat7 (7.0.56-2) unstable; urgency=medium

test/org/apache/catalina/core/TestStandardContextAliases.java | 8 4 + 4 - 0 !
1 file changed, 4 insertions(+), 4 deletions(-)

 changes the name of the standard taglibs jars used in the tests to the ones available in debian

build.xml | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 add asm to the test classpath (required by easymock)