bloritsch 01/06/19 12:55:19
Modified: src/org/apache/cocoon Tag: cocoon_20_branch cocoon.roles
src/org/apache/cocoon/components/language/markup/xsp/java
Tag: cocoon_20_branch esql.xsl
Log:
Fix cocoon.roles with incorrect classname
Fix esql.xsl with rethrowing exceptions on
setAutoCommit()
Revision Changes Path
No revision
No revision
1.6.2.5 +1 -1 xml-cocoon2/src/org/apache/cocoon/cocoon.roles
Index: cocoon.roles
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/cocoon.roles,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -r1.6.2.4 -r1.6.2.5
--- cocoon.roles 2001/06/12 16:21:27 1.6.2.4
+++ cocoon.roles 2001/06/19 19:55:07 1.6.2.5
@@ -47,7 +47,7 @@
shorthand="datasources"
default-class="org.apache.avalon.excalibur.component.ExcaliburComponentSelector">
<hint shorthand="jdbc"
class="org.apache.avalon.excalibur.datasource.JdbcDataSource"/>
- <hint shorthand="j2ee"
class="org.apache.excalibur.datasource.J2eeDataSource"/>
+ <hint shorthand="j2ee"
class="org.apache.avalon.excalibur.datasource.J2eeDataSource"/>
</role>
<role name="org.apache.cocoon.components.url.URLFactory"
No revision
No revision
1.4.2.2 +2 -2
xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- esql.xsl 2001/06/13 22:05:43 1.4.2.1
+++ esql.xsl 2001/06/19 19:55:14 1.4.2.2
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: esql.xsl,v 1.4.2.1 2001/06/13 22:05:43 giacomo Exp $-->
+<!-- $Id: esql.xsl,v 1.4.2.2 2001/06/19 19:55:14 bloritsch Exp $-->
<!--
============================================================================
@@ -359,7 +359,7 @@
}
}
} catch (Exception _esql_exception_<xsl:value-of
select="generate-id(.)"/>) {
- throw new RuntimeException("Error setting connection autocommit");
+ // do NOT: throw new RuntimeException("Error setting connection
autocommit");
}
<xsl:if test="esql:use-limit-clause">
{
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
