[tomcat8] 01/02: Install tomcat-dbcp.jar in libtomcat8-java and use it as the default JDBC pool
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jun 25 12:21:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository tomcat8.
commit 980df8167f4f9a2facfdc484efebc73a91c9ce57
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 25 11:45:07 2014 +0200
Install tomcat-dbcp.jar in libtomcat8-java and use it as the default JDBC pool
---
debian/README.Debian | 11 ------
debian/changelog | 7 ++++
debian/control | 6 ++--
debian/libtomcat8-java.poms | 1 +
debian/patches/0017-use-jdbc-pool-default.patch | 46 -------------------------
debian/patches/series | 1 -
debian/rules | 3 +-
debian/tomcat8-common.links | 1 +
8 files changed, 12 insertions(+), 64 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 837a6db..7ad7866 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -35,14 +35,3 @@ Getting started:
and then configure your Tomcat to listen on any port number you
wish. See the "man authbind" for information on configuring
authbind.
-
-Deviations from upstream's tomcat8:
-
- * In order to prevent library duplication, this version of tomcat
- does not provide tomcat-dbcp.jar. Instead, it uses the lightweight,
- scalable JDBC Pool implementation provided as part of tomcat8.
- This also means that libtomcat8-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 8e28163..7493d56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tomcat8 (8.0.9-2) UNRELEASED; urgency=medium
+
+ * Install the missing tomcat-dbcp.jar in libtomcat8-java and use it as
+ the default JDBC pool implementation instead of Commons DBCP.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 25 Jun 2014 11:40:20 +0200
+
tomcat8 (8.0.9-1) unstable; urgency=medium
[ Emmanuel Bourg ]
diff --git a/debian/control b/debian/control
index 916270b..9834eca 100644
--- a/debian/control
+++ b/debian/control
@@ -79,10 +79,8 @@ Description: Apache Tomcat 8 - Servlet and JSP engine -- tools to create user in
Package: libtomcat8-java
Architecture: all
-Depends: libcommons-dbcp-java,
- libcommons-pool-java,
- libecj-java,
- ${misc:Depends}
+Depends: libecj-java, ${misc:Depends}
+Recommends: libcommons-dbcp-java, libcommons-pool-java
Suggests: tomcat8 (>= ${source:Version})
Description: Apache Tomcat 8 - Servlet and JSP engine -- core libraries
Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
diff --git a/debian/libtomcat8-java.poms b/debian/libtomcat8-java.poms
index a769c92..e58c4d7 100644
--- a/debian/libtomcat8-java.poms
+++ b/debian/libtomcat8-java.poms
@@ -4,6 +4,7 @@ debian/poms/tomcat-catalina.pom --java-lib --usj-name=tomcat8-catalina
debian/poms/tomcat-catalina-ant.pom --java-lib --usj-name=tomcat8-catalina-ant --artifact=output/build/lib/catalina-ant.jar
debian/poms/tomcat-catalina-ha.pom --java-lib --usj-name=tomcat8-catalina-ha --artifact=output/build/lib/catalina-ha.jar
debian/poms/tomcat-coyote.pom --java-lib --usj-name=tomcat8-coyote --artifact=output/build/lib/tomcat-coyote.jar
+debian/poms/tomcat-dbcp.pom --java-lib --usj-name=tomcat8-dbcp --artifact=output/build/lib/tomcat-dbcp.jar
debian/poms/tomcat-el-api.pom --java-lib --usj-name=tomcat8-el-api --artifact=output/build/lib/el-api.jar
debian/poms/tomcat-i18n-es.pom --java-lib --usj-name=tomcat8-i18n-es --artifact=output/build/lib/tomcat-i18n-es.jar
debian/poms/tomcat-i18n-fr.pom --java-lib --usj-name=tomcat8-i18n-fr --artifact=output/build/lib/tomcat-i18n-fr.jar
diff --git a/debian/patches/0017-use-jdbc-pool-default.patch b/debian/patches/0017-use-jdbc-pool-default.patch
deleted file mode 100644
index 84f8b6f..0000000
--- a/debian/patches/0017-use-jdbc-pool-default.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
---- 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.dbcp2.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
-@@ -590,9 +590,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.dbcp2.BasicDataSourceFactory</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>
-+ <code>org.apache.tomcat.jdbc.pool.DataSourceFactory</code> is used.</p>
- </property>
-
- <property name="javax.mail.Session.Factory">
---- a/webapps/docs/jndi-resources-howto.xml
-+++ b/webapps/docs/jndi-resources-howto.xml
-@@ -662,7 +662,7 @@
-
- <p>The configuration properties for Tomcat's standard data source
- resource factory
-- (<code>org.apache.tomcat.dbcp.dbcp2.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 22b56f0..5632618 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@
0013-dont-look-for-build-properties-in-user-home.patch
0014-JDTCompiler.patch
0015_disable_test_TestCometProcessor.patch
-0017-use-jdbc-pool-default.patch
0018-fix-manager-webapp.patch
0019-add-distribution-to-error-page.patch
0020-disable-java8-support-with-jdtcompiler.patch
diff --git a/debian/rules b/debian/rules
index e944f2d..348e308 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,8 +44,7 @@ ANT_ARGS := -Dcompile.debug=true \
-Dversion.build="$(T_VER_BUILD)" \
-Dversion.patch="0" \
-Ddistribution.name=$(TOMCAT_DISTRIBUTION) \
- -Dversion.suffix="" \
- -Dno.build.dbcp=true
+ -Dversion.suffix=""
ANT_INVOKE := $(JAVA_CMD) -classpath "$(DEB_CLASSPATH)" org.apache.tools.ant.Main $(ANT_ARGS)
diff --git a/debian/tomcat8-common.links b/debian/tomcat8-common.links
index 656d255..63c9690 100644
--- a/debian/tomcat8-common.links
+++ b/debian/tomcat8-common.links
@@ -8,6 +8,7 @@
/usr/share/java/tomcat8-catalina-ha.jar /usr/share/tomcat8/lib/catalina-ha.jar
/usr/share/java/tomcat8-catalina-storeconfig.jar /usr/share/tomcat8/lib/catalina-storeconfig.jar
/usr/share/java/tomcat8-coyote.jar /usr/share/tomcat8/lib/tomcat-coyote.jar
+/usr/share/java/tomcat8-dbcp.jar /usr/share/tomcat8/lib/tomcat-dbcp.jar
/usr/share/java/tomcat8-el-api.jar /usr/share/tomcat8/lib/el-api.jar
/usr/share/java/tomcat8-i18n-es.jar /usr/share/tomcat8/lib/tomcat-i18n-es.jar
/usr/share/java/tomcat8-i18n-fr.jar /usr/share/tomcat8/lib/tomcat-i18n-fr.jar
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git
More information about the pkg-java-commits
mailing list