[tomcat6/f14] resolves rhbz 669969

[Dave Knox]

commit 473910f10bd795f038523a2344aa59938fe8d091
Author: David Knox <dknox at dknox.(none)>
Date:   Fri Jul 1 16:26:22 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 5474c18..636d378 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 22%{?dist}
+Release: 23%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -644,6 +644,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Fri Jul 1 2011 David Knox <dknox at redhat.com> 0:6.0.26-23
+- Resolves rhbz 669969 - BasicDataSourceFactory in sysconfig
+
 * Tue Jun 28 2011 David Knox <dknox at redhat.com> 0:6.0.26-22
 - Resolves rhbz 717016 CVE-2011-2204