vgritsenko 01/06/21 19:47:43
Modified: src/org/apache/cocoon/components/language/markup/sitemap/java
sitemap.xsl
Log:
- initialize selectors
- add <xsl:otherwise> where was absent
Revision Changes Path
1.20 +18 -5
xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/sitemap/java/sitemap.xsl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sitemap.xsl 2001/06/21 11:20:15 1.19
+++ sitemap.xsl 2001/06/22 02:47:40 1.20
@@ -44,6 +44,7 @@
<xsl:choose>
<xsl:when test="contains(system-property('xsl:vendor-url'),
'xalan')">xalan</xsl:when>
<xsl:when test="contains(system-property('xsl:vendor-url'),
'saxon')">saxon</xsl:when>
+ <xsl:otherwise>unknown</xsl:otherwise>
</xsl:choose>
</xsl:variable>
@@ -127,7 +128,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Giacomo Pati</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
- * @version CVS $Id: sitemap.xsl,v 1.19 2001/06/21 11:20:15 dims Exp $
+ * @version CVS $Id: sitemap.xsl,v 1.20 2001/06/22 02:47:40 vgritsenko Exp $
*/
public class <xsl:value-of select="@file-name"/> extends AbstractSitemap {
static final String LOCATION = "<xsl:value-of select="translate(@file-path,
'/', '.')"/>.<xsl:value-of select="@file-name"/>";
@@ -223,6 +224,14 @@
configurer.configActions();
configurer = null;
+ this.generators.initialize();
+ this.transformers.initialize();
+ this.serializers.initialize();
+ this.readers.initialize();
+ this.actions.initialize();
+ this.matchers.initialize();
+ this.selectors.initialize();
+
this.manager.initialize();
/* catch any exception thrown by a component during configuration */
} catch (Exception e) {
@@ -417,9 +426,9 @@
throw e;
} finally {
if(eventPipeline != null)
- manager.release(eventPipeline);
+ this.manager.release(eventPipeline);
if(pipeline != null)
- manager.release(pipeline);
+ this.manager.release(pipeline);
}
return result;
}
@@ -1188,11 +1197,16 @@
<xsl:when test="@session='no'">false</xsl:when>
<xsl:when test="@session='false'">false</xsl:when>
<xsl:when test="not(@session)">false</xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="error">
+ <xsl:with-param name="message">Invalid value of session= attribute
of redirect-to element</xsl:with-param>
+ </xsl:call-template>
+ </xsl:otherwise>
</xsl:choose>
</xsl:variable>
getLogger().debug("Sitemap: session='<xsl:value-of select="$sess"/>',
redirecting to '<xsl:value-of select="@uri"/>'");
environment.redirect (<xsl:value-of select="$sess"/>,
substitute(listOfMaps, "<xsl:value-of select="@uri"/>"));
- if(true)return true;
+ if (true) return true;
</xsl:when>
<!-- any other combination generates an error message -->
@@ -1588,4 +1602,3 @@
<xsl:template match="map:logicsheet|map:dependency|map:handle-errors"/>
</xsl:stylesheet>
-
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]