joerg 2003/06/11 16:26:28
Modified: src/java/org/apache/cocoon/components/language/markup/xsp/java
esql.xsl
Log:
fixed usage of deprecated(?) method XSPUtil.include() by usage of convenience
methods (bug 20658)
Revision Changes Path
1.3 +11 -25
cocoon-2.0/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
Index: esql.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.0/src/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- esql.xsl 1 May 2003 13:39:01 -0000 1.2
+++ esql.xsl 11 Jun 2003 23:26:28 -0000 1.3
@@ -925,29 +925,15 @@
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
- <xsp:logic>
- {
- org.apache.cocoon.components.parser.Parser newParser = null;
-
- try {
- newParser = (org.apache.cocoon.components.parser.Parser)
this.manager.lookup(org.apache.cocoon.components.parser.Parser.ROLE);
-
- InputSource __is = new InputSource(
- new StringReader(
- String.valueOf(<xsl:copy-of select="$content"/>)
- )
- );
-
-
- XSPUtil.include(__is, this.contentHandler, newParser);
- } catch (Exception e) {
- if (getLogger().isErrorEnabled())
- getLogger().error("Could not include page", e);
- } finally {
- if (newParser != null) this.manager.release((Component) newParser);
- }
- }
- </xsp:logic>
+ <xsp:logic>
+ {
+ try {
+ XSPUtil.includeString(<xsl:copy-of select="$content"/>, this.manager,
this.contentHandler);
+ } catch (Exception _esql_exception_<xsl:value-of select="generate-id(.)"/>)
{
+ getLogger().error("Could not include XML string",
_esql_exception_<xsl:value-of select="generate-id(.)"/>);
+ }
+ }
+ </xsp:logic>
</xsl:template>
<xspdoc:desc>returns the number of columns in the resultset.</xspdoc:desc>
