balld 00/10/13 14:41:32
Modified: lib turbine-pool.jar
src/org/apache/cocoon/processor/xsp/library/sql
XSPSQLLibrary.java esql.xsl
Log:
upgraded turbine connection pool
Revision Changes Path
1.4 +320 -189 xml-cocoon/lib/turbine-pool.jar
<<Binary file>>
1.11 +4 -3
xml-cocoon/src/org/apache/cocoon/processor/xsp/library/sql/XSPSQLLibrary.java
Index: XSPSQLLibrary.java
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/library/sql/XSPSQLLibrary.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XSPSQLLibrary.java 2000/08/07 02:24:28 1.10
+++ XSPSQLLibrary.java 2000/10/13 21:41:29 1.11
@@ -55,19 +55,20 @@
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import org.w3c.dom.*;
-import org.apache.turbine.util.db.pool.*;
+import org.apache.turbine.services.db.PoolBrokerService;
+import org.apache.turbine.util.db.pool.DBConnection;
import org.apache.turbine.util.Log;
/**
* A processor that performs SQL database queries.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Donald Ball</a>
- * @version $Revision: 1.10 $ $Date: 2000/08/07 02:24:28 $
+ * @version $Revision: 1.11 $ $Date: 2000/10/13 21:41:29 $
*/
public class XSPSQLLibrary {
- static DBBroker pool = DBBroker.getInstance();
+ static PoolBrokerService pool = PoolBrokerService.getInstance();
public static Element[] executeQuery(
Document document,
1.21 +3 -3
xml-cocoon/src/org/apache/cocoon/processor/xsp/library/sql/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/src/org/apache/cocoon/processor/xsp/library/sql/esql.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- esql.xsl 2000/10/05 17:51:14 1.20
+++ esql.xsl 2000/10/13 21:41:30 1.21
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.20 2000/10/05 17:51:14 balld Exp $-->
+<!-- $Id: esql.xsl,v 1.21 2000/10/13 21:41:30 balld Exp $-->
<!--
============================================================================
@@ -102,11 +102,11 @@
<xsp:include>java.sql.SQLException</xsp:include>
<xsp:include>java.text.SimpleDateFormat</xsp:include>
<xsp:include>java.text.DecimalFormat</xsp:include>
-
<xsp:include>org.apache.turbine.util.db.pool.DBBroker</xsp:include>
+
<xsp:include>org.apache.turbine.services.db.PoolBrokerService</xsp:include>
<xsp:include>org.apache.turbine.util.db.pool.DBConnection</xsp:include>
</xsp:structure>
<xsp:logic>
- static DBBroker _esql_pool = DBBroker.getInstance();
+ static PoolBrokerService _esql_pool =
PoolBrokerService.getInstance();
class EsqlSession {
DBConnection db_connection=null;
Connection connection=null;
