Author: markt
Date: Sun Mar 23 19:06:57 2014
New Revision: 1580572
URL: http://svn.apache.org/r1580572
Log:
Allow web applications to package tomcat-jdbc.jar and their JDBC driver of
choice in the web application.
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1580572&r1=1580571&r2=1580572&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Sun Mar
23 19:06:57 2014
@@ -196,7 +196,8 @@ public class WebappClassLoader extends U
* {@link #packageTriggersDeny}.
*/
protected final Matcher packageTriggersPermit =
- Pattern.compile("^javax\\.servlet\\.jsp\\.jstl\\.").matcher("");
+ Pattern.compile("^javax\\.servlet\\.jsp\\.jstl\\.|" +
+ "^org\\.apache\\.tomcat\\.jdbc\\.").matcher("");
/**
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1580572&r1=1580571&r2=1580572&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 23 19:06:57 2014
@@ -51,6 +51,10 @@
Rework the fix for <bug>56190</bug> as the previous fix did not recycle
the request in all cases leading to mis-routing of requests. (markt)
</fix>
+ <fix>
+ Allow web applications to package tomcat-jdbc.jar and their JDBC driver
+ of choice in the web application. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
