antonio 2003/10/10 17:02:55
Modified:
src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java
session-fw.xsl
src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp
XSPSessionFwHelper.java
Log:
Fixing bug <xsp-session-fw:getxml> when used with as="string"
Revision Changes Path
1.2 +6 -5
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl
Index: session-fw.xsl
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/java/session-fw.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- session-fw.xsl 3 Sep 2003 13:13:27 -0000 1.1
+++ session-fw.xsl 11 Oct 2003 00:02:55 -0000 1.2
@@ -54,7 +54,7 @@
<!--
* XSP Session-fw logicsheet for the Java language
*
- * @author <a href="mailto:[EMAIL PROTECTED]>Antonio Gallardo</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]>Antonio Gallardo</a>
* @version CVS $Revision$ $Date$
-->
@@ -72,6 +72,7 @@
<xsp:include>org.apache.cocoon.environment.Session</xsp:include>
<xsp:include>org.apache.avalon.framework.component.ComponentManager</xsp:include>
<xsp:include>org.apache.cocoon.components.language.markup.xsp.XSPSessionFwHelper</xsp:include>
+ <xsp:include>org.w3c.dom.DocumentFragment</xsp:include>
</xsp:structure>
<xsl:variable name="create">
@@ -103,9 +104,9 @@
</xsl:variable>
<xsl:choose>
<xsl:when test="$as='string'">
- <xsp:expr>(XSPSessionFwHelper.getXML(this.manager,
+
<xsp:expr>((DocumentFragment)(XSPSessionFwHelper.getXML(this.manager,
String.valueOf(<xsl:copy-of select="$context"/>),
- String.valueOf(<xsl:copy-of
select="$path"/>))).getFirstChild().getNodeValue()</xsp:expr>
+ String.valueOf(<xsl:copy-of
select="$path"/>)))).getFirstChild().getNodeValue()</xsp:expr>
</xsl:when>
<xsl:when test="$as='xml'">
<xsp-session-fw:xml>
1.3 +2 -2
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java
Index: XSPSessionFwHelper.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/components/language/markup/xsp/XSPSessionFwHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSPSessionFwHelper.java 9 Oct 2003 07:18:36 -0000 1.2
+++ XSPSessionFwHelper.java 11 Oct 2003 00:02:55 -0000 1.3
@@ -63,7 +63,7 @@
/**
* The <code>Session-fw</code> object helper
*
- * @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Antonio Gallardo</a>
* @version CVS $Id$
* @since 2.1.1
*/
