balld 01/02/05 13:25:22
Modified: src/org/apache/cocoon/processor/xsp/library/sql esql.xsl
Log:
moved turbine and datasources stuff inside conditional - only included if used
Revision Changes Path
1.61 +39 -33
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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- esql.xsl 2001/02/05 20:52:53 1.60
+++ esql.xsl 2001/02/05 21:25:21 1.61
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.60 2001/02/05 20:52:53 balld Exp $-->
+<!-- $Id: esql.xsl,v 1.61 2001/02/05 21:25:21 balld Exp $-->
<!--
============================================================================
@@ -174,46 +174,52 @@
<xsp:include>java.text.DecimalFormat</xsp:include>
<xsp:include>java.io.StringWriter</xsp:include>
<xsp:include>java.io.PrintWriter</xsp:include>
- <xsl:choose>
- <xsl:when test="$environment = 'cocoon1'">
-
<xsp:include>org.apache.turbine.services.db.PoolBrokerService</xsp:include>
-
<xsp:include>org.apache.turbine.util.db.pool.DBConnection</xsp:include>
- </xsl:when>
- <xsl:when test="$environment = 'cocoon2'">
-
<xsp:include>org.apache.cocoon.components.datasource.DataSourceComponent</xsp:include>
-
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
- </xsl:when>
- </xsl:choose>
+ <xsl:if test=".//esql:connection/esql:pool">
+ <xsl:choose>
+ <xsl:when test="$environment = 'cocoon1'">
+
<xsp:include>org.apache.turbine.services.db.PoolBrokerService</xsp:include>
+
<xsp:include>org.apache.turbine.util.db.pool.DBConnection</xsp:include>
+ </xsl:when>
+ <xsl:when test="$environment = 'cocoon2'">
+
<xsp:include>org.apache.cocoon.components.datasource.DataSourceComponent</xsp:include>
+
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPUtil</xsp:include>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:if>
</xsp:structure>
<xsp:logic>
- <xsl:choose>
- <xsl:when test="$environment = 'cocoon1'">
- static PoolBrokerService _esql_pool =
PoolBrokerService.getInstance();
- </xsl:when>
- <xsl:when test="$environment = 'cocoon2'">
- private static ComponentSelector _esql_selector = null;
-
- public void compose(ComponentManager manager) {
- super.compose(manager);
- if (_esql_selector == null) {
- try {
- _esql_selector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
- } catch (ComponentManagerException cme) {
- log.error("Could not look up the datasource component", cme);
- }
- }
- }
- </xsl:when>
- </xsl:choose>
- class EsqlConnection {
+ <xsl:if test=".//esql:connection/esql:pool">
<xsl:choose>
<xsl:when test="$environment = 'cocoon1'">
- DBConnection db_connection = null;
+ static PoolBrokerService _esql_pool =
PoolBrokerService.getInstance();
</xsl:when>
<xsl:when test="$environment = 'cocoon2'">
- DataSourceComponent datasource = null;
+ private static ComponentSelector _esql_selector = null;
+
+ public void compose(ComponentManager manager) {
+ super.compose(manager);
+ if (_esql_selector == null) {
+ try {
+ _esql_selector = (ComponentSelector)
manager.lookup(Roles.DB_CONNECTION);
+ } catch (ComponentManagerException cme) {
+ log.error("Could not look up the datasource component",
cme);
+ }
+ }
+ }
</xsl:when>
</xsl:choose>
+ </xsl:if>
+ class EsqlConnection {
+ <xsl:if test=".//esql:connection/esql:pool">
+ <xsl:choose>
+ <xsl:when test="$environment = 'cocoon1'">
+ DBConnection db_connection = null;
+ </xsl:when>
+ <xsl:when test="$environment = 'cocoon2'">
+ DataSourceComponent datasource = null;
+ </xsl:when>
+ </xsl:choose>
+ </xsl:if>
Connection connection = null;
String dburl = null;
String username = null;
