[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.26-2-2-g173af8d

[tony mancill]

The following commit has been merged in the master branch:
commit c0d74797c82c6f9ab6af7f1a25e89af5d9e5dffe
Author: tony mancill <tmancill at debian.org>
Date:   Fri May 4 21:29:25 2012 -0700

    add patch for #671370

diff --git a/debian/changelog b/debian/changelog
index e7afc85..452584e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+tomcat7 (7.0.26-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Apply patches provided by James Page (Closes: #671370)
+    - d/patches/0012-java7-compat.patch: Added compatibility patch to
+      support compilation with openjdk-7 as default-jdk (LP: #889002).
+    - d/default_root/index.html: Fixup instructions for enabling
+      manager web application access (LP: #910368).
+
+ -- tony mancill <tmancill at debian.org>  Fri, 04 May 2012 21:23:42 -0700
+
 tomcat7 (7.0.26-2) unstable; urgency=low
 
   [ tony mancill ]
diff --git a/debian/default_root/index.html b/debian/default_root/index.html
index 34ce9d5..9c48b99 100644
--- a/debian/default_root/index.html
+++ b/debian/default_root/index.html
@@ -23,7 +23,7 @@
 
 <p><b>tomcat7-admin</b>: This package installs two web applications that can help managing this Tomcat instance. Once installed, you can access the <a href="manager/html">manager webapp</a> and the <a href="host-manager/html">host-manager webapp</a>.<p>
 
-<p>NOTE: For security reasons, using the manager webapp is restricted to users with role "manager". The host-manager webapp is restricted to users with role "admin". Users are defined in <code>/etc/tomcat7/tomcat-users.xml</code>.</p>
+<p>NOTE: For security reasons, using the manager webapp is restricted to users with role "manager-gui". The host-manager webapp is restricted to users with role "admin-gui". Users are defined in <code>/etc/tomcat7/tomcat-users.xml</code>.</p>
 
 </body>
 </html>
diff --git a/debian/patches/0012-java7-compat.patch b/debian/patches/0012-java7-compat.patch
new file mode 100644
index 0000000..8e02e76
--- /dev/null
+++ b/debian/patches/0012-java7-compat.patch
@@ -0,0 +1,27 @@
+Description: Compatibility patch to support compilation of tomcat7
+ using openjdk-7
+Author: James Page <james.page at ubuntu.com>
+Forwarded: not-needed
+
+Index: tomcat7-7.0.26/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java
+===================================================================
+--- tomcat7-7.0.26.orig/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java	2012-05-03 14:41:45.741927187 +0100
++++ tomcat7-7.0.26/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSource.java	2012-05-03 14:42:25.730122612 +0100
+@@ -28,6 +28,8 @@
+ import org.apache.juli.logging.Log;
+ import org.apache.juli.logging.LogFactory;
+ 
++import java.sql.SQLFeatureNotSupportedException;
++import java.util.logging.Logger;
+ 
+ /**
+  * A DataSource that can be instantiated through IoC and implements the DataSource interface
+@@ -153,5 +155,7 @@
+         }
+     }
+ 
+-
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException();
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index afbc008..ea51de7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0009-Use-java.security.policy-file-in-catalina.sh.patch
 0010-debianize-build-xml.patch
 0011-fix-classpath-lintian-warnings.patch
+0012-java7-compat.patch

-- 
tomcat7: Servlet and JSP engine