[tomcat6/f15] resolves rhbz 669969

[Dave Knox]

commit 8baa53a88656e7dcf001579bb2145b9c2dbfe256
Author: David Knox <dknox at dknox.(none)>
Date:   Fri Jul 1 15:45:08 2011 -0600

    resolves rhbz 669969

 tomcat6-6.0.sysconfig |    2 ++
 tomcat6.spec          |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/tomcat6-6.0.sysconfig b/tomcat6-6.0.sysconfig
index caefeed..d15d306 100644
--- a/tomcat6-6.0.sysconfig
+++ b/tomcat6-6.0.sysconfig
@@ -29,6 +29,8 @@
 # Use JAVA_OPTS to set java.library.path for libtcnative.so
 #JAVA_OPTS="-Djava.library.path=@@@LIBDIR@@@"
 
+JAVA_OPTS="${JAVA_OPTS} -Djavax.sql.DataSource.Factory=org.apache.commons.dbcp.BasicDataSourceFactory"
+
 # What user should run tomcat
 #TOMCAT_USER="tomcat"
 
diff --git a/tomcat6.spec b/tomcat6.spec
index 97da03a..742e12f 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -53,7 +53,7 @@
 Name:          tomcat6
 Epoch:         0
 Version:       %{major_version}.%{minor_version}.%{micro_version}
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group:         Networking/Daemons
@@ -572,6 +572,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Fri Jul 1 2011 David Knox <dknox at redhat.com> 0:6.0.32-4
+- Resolves thbz 669969 - DataSourceFactory config in sysconfig
+
 * Tue Jun 28 2011 David Knox <dknox at redhat.com> - 0:6.0.32-3
 - Resolves CVE-2011-2204 rhbz 717016
 - Resolves dangling symlink to log4j