← Back to branch summary

~ubuntu-branches/ubuntu/vivid/tomcat6/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/0005-change-default-DBCP-factory-class.patch

  • Committer: Package Import Robot
  • Author(s): tony mancill
  • Date: 2013-08-03 21:50:20 UTC
  • mfrom: (1.2.9)
  • Revision ID: package-import@ubuntu.com-20130803215020-glb1brkoau0zxr5x
Tags: 6.0.37-1
* New upstream release.
  - Drop patches for CVE-2012-4534, CVE-2012-4431, CVE-2012-3546,
    CVE-2012-2733, CVE-2012-3439
  - Drop 0011-CVE-02012-0022-regression-fix.patch
  - Drop 0017-eclipse-compiler-update.patch
* Freshened remaining patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0005-change-default-DBCP-factory-class.patch
8
8
 webapps/docs/jndi-resources-howto.xml         |    4 ++--
9
9
 2 files changed, 3 insertions(+), 3 deletions(-)
10
10
 
11
 
diff --git a/java/org/apache/naming/factory/Constants.java b/java/org/apache/naming/factory/Constants.java
12
 
index 22ef7aa..ab1d759 100644
13
11
--- a/java/org/apache/naming/factory/Constants.java
14
12
+++ b/java/org/apache/naming/factory/Constants.java
15
 
@@ -49,7 +49,7 @@ public final class Constants {
 
13
@@ -49,7 +49,7 @@
16
14
         Package + ".HandlerFactory";
17
15
 
18
16
     public static final String DBCP_DATASOURCE_FACTORY = 
21
19
 
22
20
     public static final String OPENEJB_EJB_FACTORY = 
23
21
         Package + ".OpenEjbFactory";
24
 
diff --git a/webapps/docs/jndi-resources-howto.xml b/webapps/docs/jndi-resources-howto.xml
25
 
index e721854..be94cd4 100644
26
22
--- a/webapps/docs/jndi-resources-howto.xml
27
23
+++ b/webapps/docs/jndi-resources-howto.xml
28
 
@@ -656,9 +656,9 @@ conn.close();
 
24
@@ -668,9 +668,9 @@
29
25
     <code>driverName</code> parameters to match your actual database's
30
26
     JDBC driver and connection URL.</p>
31
27
 
37
33
     as follows:</p>
38
34
     <ul>
39
35
     <li><strong>driverClassName</strong> - Fully qualified Java class name