You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by bl...@apache.org on 2001/01/06 00:07:36 UTC
cvs commit: xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java esql.xsl xsp.xsl
bloritsch 01/01/05 15:07:36
Modified: src/org/apache/cocoon Tag: xml-cocoon2 Roles.java
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: xml-cocoon2 esql.xsl xsp.xsl
Log:
Added support for DataSourceComponent.
Revision Changes Path
No revision
No revision
1.1.2.2 +2 -1 xml-cocoon/src/org/apache/cocoon/Attic/Roles.java
Index: Roles.java
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/Attic/Roles.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Roles.java 2000/10/19 14:42:39 1.1.2.1
+++ Roles.java 2001/01/05 23:07:34 1.1.2.2
@@ -10,7 +10,7 @@
/**
* @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @version CVS $Revision: 1.1.2.1 $ $Date: 2000/10/19 14:42:39 $
+ * @version CVS $Revision: 1.1.2.2 $ $Date: 2001/01/05 23:07:34 $
*/
public interface Roles {
@@ -26,5 +26,6 @@
String CLASS_LOADER = "org.apache.cocoon.components.classloader.ClassLoaderManager";
String POOL_CONTROLLER = "org.apache.avalon.util.pool.PoolController";
String IMAGE_ENCODER = "org.apache.cocoon.components.image.ImageEncoderSelector";
+ String DB_CONNECTION = "org.apache.cocoon.components.datasource.DataSourceComponentSelector";
}
No revision
No revision
1.1.2.19 +6 -1 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl
Index: esql.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/esql.xsl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- esql.xsl 2000/12/29 16:55:17 1.1.2.18
+++ esql.xsl 2001/01/05 23:07:35 1.1.2.19
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.1.2.18 2000/12/29 16:55:17 bloritsch Exp $-->
+<!-- $Id: esql.xsl,v 1.1.2.19 2001/01/05 23:07:35 bloritsch Exp $-->
<!--
============================================================================
@@ -109,6 +109,7 @@
<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.cocoon.components.datasource.DataSourceComponent</xsp:include>
</xsp:structure>
<xsp:logic>
@@ -267,6 +268,9 @@
esqlSession.closeConnection = false;
</xsl:when>
<xsl:when test="esql:use-connection">
+ ComponentSelector esqlDSSelector = (ComponentSelector) this.manager.lookup(Roles.DB_CONNECTION);
+ DataSourceComponent esqlDS = (DataSourceComponent) esqlDSSelector.select(String.valueOf(<xsl:copy-of select="$use-connection"/>));
+ esqlSession.connection = esqlDS.getConnection();
<!-- FIXME - need to do avalon pooling here maybe? -->
</xsl:when>
<xsl:otherwise>
@@ -377,6 +381,7 @@
}
<xsl:if test="esql:use-connection">
+ esqlSession.connection = null;
<!-- FIXME - need to release avalon pooling here maybe -->
</xsl:if>
}
1.1.2.21 +2 -2 xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl
Index: xsp.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/src/org/apache/cocoon/components/language/markup/xsp/java/Attic/xsp.xsl,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- xsp.xsl 2001/01/05 15:00:48 1.1.2.20
+++ xsp.xsl 2001/01/05 23:07:36 1.1.2.21
@@ -11,7 +11,7 @@
<!--
* @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
- * @version CVS $Revision: 1.1.2.20 $ $Date: 2001/01/05 15:00:48 $
+ * @version CVS $Revision: 1.1.2.21 $ $Date: 2001/01/05 23:07:36 $
-->
<!-- XSP Core logicsheet for the Java language -->
@@ -43,7 +43,7 @@
import org.xml.sax.helpers.*;
import org.apache.avalon.*;
- import org.apache.avalon.utils.*;
+ import org.apache.avalon.util.*;
import org.apache.log.*;
import org.apache.cocoon.*;
import org.apache.cocoon.generation.*;