[SCM] tomcat7: Servlet and JSP engine branch, exp/master, updated. debian/7.0.35-1_exp1-2-ga5aa8d8
James Page
james.page at ubuntu.com
Mon Feb 25 09:06:43 UTC 2013
The following commit has been merged in the exp/master branch:
commit a5aa8d8192a3d913377812cfe541c1171a8b4df4
Author: James Page <james.page at ubuntu.com>
Date: Sun Feb 24 22:21:35 2013 +0000
Switch from Commons DBCP to Tomcat JDBC Pool as default connection pool implementation (Closes: #701023).
diff --git a/debian/NEWS b/debian/NEWS
new file mode 100644
index 0000000..a7e1d2d
--- /dev/null
+++ b/debian/NEWS
@@ -0,0 +1,6 @@
+tomcat7 (7.0.35-1~exp2) experimental; urgency=low
+
+ The Tomcat JDBC Pool module is now enabled by default instead of the
+ commons-dbcp implementation used in previous versions of this package.
+
+ -- James Page <james.page at ubuntu.com> Sun, 24 Feb 2013 22:08:22 +0000
diff --git a/debian/README.Debian b/debian/README.Debian
index 536453f..0c97203 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -28,8 +28,10 @@ Getting started:
Deviations from upstream's tomcat7:
* In order to prevent library duplication, this version of tomcat
- does not provide tomcat-dbcp.jar. Instead, it uses commons-dbcp.jar
- from the libcommons-dbcp-java package. This also means that
- libtomcat7-java does not provide the tomcat-dbcp.pom for the
- local maven-repo. For more information and rationale, see:
+ does not provide tomcat-dbcp.jar. Instead, it uses the lightweight,
+ scalable JDBC Pool implementation provided as part of tomcat7.
+ This also means that libtomcat7-java does not provide the
+ tomcat-dbcp.pom for the local maven-repo. For more information
+ and rationale, see:
https://bugs.launchpad.net/ubuntu/+source/tomcat6/+bug/283852
+
diff --git a/debian/changelog b/debian/changelog
index be4672d..6a68342 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat7 (7.0.35-1~exp2) UNRELEASED; urgency=low
+
+ * Switch from Commons DBCP to Tomcat JDBC Pool as default connection
+ pool implementation (Closes: #701023).
+
+ -- James Page <james.page at ubuntu.com> Sun, 24 Feb 2013 22:08:22 +0000
+
tomcat7 (7.0.35-1~exp1) experimental; urgency=low
* New upstream version 7.0.35
diff --git a/debian/libtomcat7-java.poms b/debian/libtomcat7-java.poms
index 4824802..c7628f8 100644
--- a/debian/libtomcat7-java.poms
+++ b/debian/libtomcat7-java.poms
@@ -8,4 +8,4 @@ debian/poms/tomcat-jasper-el.pom
debian/poms/tomcat-juli.pom
debian/poms/tomcat-tribes.pom
debian/poms/tomcat-util.pom
-
+debian/poms/tomcat-jdbc.pom
diff --git a/debian/patches/0005-change-default-DBCP-factory-class.patch b/debian/patches/0005-change-default-DBCP-factory-class.patch
deleted file mode 100644
index fd87549..0000000
--- a/debian/patches/0005-change-default-DBCP-factory-class.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Thierry Carrez <thierry.carrez at ubuntu.com>
-Date: Mon, 28 Jun 2010 21:32:44 +0200
-Subject: [PATCH] change default DBCP factory class
-
-... to org.apache.commons.dbcp.BasicDataSourceFactory
----
- java/org/apache/naming/factory/Constants.java | 2 +-
- webapps/docs/jndi-resources-howto.xml | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/java/org/apache/naming/factory/Constants.java
-+++ b/java/org/apache/naming/factory/Constants.java
-@@ -49,7 +49,7 @@
- Package + ".HandlerFactory";
-
- public static final String DBCP_DATASOURCE_FACTORY =
-- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
-+ "org.apache.commons.dbcp.BasicDataSourceFactory";
-
- public static final String OPENEJB_EJB_FACTORY =
- Package + ".OpenEjbFactory";
---- a/webapps/docs/jndi-resources-howto.xml
-+++ b/webapps/docs/jndi-resources-howto.xml
-@@ -665,9 +665,9 @@
- <code>driverName</code> parameters to match your actual database's
- JDBC driver and connection URL.</p>
-
-- <p>The configuration properties for Tomcat's standard data source
-+ <p>The configuration properties for our default data source
- resource factory
-- (<code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code>) are
-+ (<code>org.apache.commons.dbcp.BasicDataSourceFactory</code>) are
- as follows:</p>
- <ul>
- <li><strong>driverClassName</strong> - Fully qualified Java class name
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
new file mode 100644
index 0000000..4425d6e
--- /dev/null
+++ b/debian/patches/0017-use-jdbc-pool-default.patch
@@ -0,0 +1,47 @@
+Description: 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.
+Author: James Page <james.page at ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/tomcat7/+bug/1071817
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+--- a/java/org/apache/naming/factory/Constants.java
++++ b/java/org/apache/naming/factory/Constants.java
+@@ -49,7 +49,7 @@ public final class Constants {
+ Package + ".HandlerFactory";
+
+ public static final String DBCP_DATASOURCE_FACTORY =
+- "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
++ "org.apache.tomcat.jdbc.pool.DataSourceFactory";
+
+ public static final String OPENEJB_EJB_FACTORY =
+ Package + ".OpenEjbFactory";
+--- a/webapps/docs/config/systemprops.xml
++++ b/webapps/docs/config/systemprops.xml
+@@ -578,7 +578,7 @@
+ <property name="javax.sql.DataSource.Factory">
+ <p>The class name of the factory to use to create resources of type
+ <code>javax.sql.DataSource</code>. If not specified the default of
+- <code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code> is used
++ <code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code> is used
+ which is a package renamed (to avoid conflictions) copy of
+ <a href="http://commons.apache.org/dbcp">Apache Commons DBCP</a>.</p>
+ </property>
+--- a/webapps/docs/jndi-resources-howto.xml
++++ b/webapps/docs/jndi-resources-howto.xml
+@@ -667,7 +667,7 @@ conn.close();
+
+ <p>The configuration properties for Tomcat's standard data source
+ resource factory
+- (<code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code>) are
++ (<code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code>) are
+ as follows:</p>
+ <ul>
+ <li><strong>driverClassName</strong> - Fully qualified Java class name
diff --git a/debian/patches/series b/debian/patches/series
index 5817396..b5733ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
0002-do-not-load-AJP13-connector-by-default.patch
0003-disable-APR-library-loading.patch
0004-split-deploy-webapps-target-from-deploy-target.patch
-0005-change-default-DBCP-factory-class.patch
0006-add-JARs-below-var-to-class-loader.patch
0009-Use-java.security.policy-file-in-catalina.sh.patch
0010-debianize-build-xml.patch
@@ -12,3 +11,4 @@
0014-JDTCompiler.patch
0015_disable_test_TestCometProcessor.patch
0016_upstream_bug_54440.patch
+0017-use-jdbc-pool-default.patch
diff --git a/debian/rules b/debian/rules
index 21f93c8..eb399a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,7 +98,6 @@ binary-indep: build install
dh_installcron
mkdir -p debian/poms
cp res/maven/*.pom debian/poms
- rm -f debian/poms/tomcat-dbcp.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \
debian/poms/tomcat-servlet-api.pom
perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/3.0/' \
@@ -140,6 +139,10 @@ binary-indep: build install
debian/poms/tomcat-util.pom \
$(BLDLIB)/tomcat-util.jar \
usr/share/tomcat7/lib/tomcat-util.jar
+ mh_installjar -plibtomcat7-java -l --usj-name=tomcat-jdbc \
+ debian/poms/tomcat-jdbc.pom \
+ output/jdbc-pool/tomcat-jdbc.jar \
+ usr/share/tomcat7/lib/tomcat-jdbc.jar
for i in $(T_JARS); do \
mv $(BLDLIB)/$$i.jar $(BLDLIB)/$$i-$(T_VER).jar && \
dh_install -plibtomcat7-java \
--
tomcat7: Servlet and JSP engine
More information about the pkg-java-commits
mailing list