You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2002/06/17 03:21:19 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap PipelineNode.java
vgritsenko 2002/06/16 18:21:18
Modified: . Tag: cocoon_2_0_3_branch changes.xml
src/java/org/apache/cocoon/components/language/markup/sitemap/java
Tag: cocoon_2_0_3_branch sitemap.xsl
src/java/org/apache/cocoon/components/treeprocessor/sitemap
Tag: cocoon_2_0_3_branch PipelineNode.java
Log:
fix bug 8509; fix ResourceNotFoundException message
Revision Changes Path
No revision
No revision
1.138.2.22 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.21
retrieving revision 1.138.2.22
diff -u -r1.138.2.21 -r1.138.2.22
--- changes.xml 16 Jun 2002 22:45:49 -0000 1.138.2.21
+++ changes.xml 17 Jun 2002 01:21:18 -0000 1.138.2.22
@@ -39,6 +39,9 @@
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="8509" due-to="Michael Melhem" due-to-email="michaelm@fztig938.bank.dresdner.net">
+ Fix sitemap compilation error when action used within view.
+ </action>
<action dev="VG" type="fix" fixes-bug="3782">
TraxTransformer and XSLTProcessor components now correctly handle
dependecies on imported (via xsl:include) XSLT stylesheets.
No revision
No revision
1.11.2.2 +5 -4 xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl
Index: sitemap.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/sitemap/java/Attic/sitemap.xsl,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -r1.11.2.1 -r1.11.2.2
--- sitemap.xsl 31 May 2002 13:59:45 -0000 1.11.2.1
+++ sitemap.xsl 17 Jun 2002 01:21:18 -0000 1.11.2.2
@@ -497,6 +497,7 @@
Map map = null;
Parameters param = null;
final boolean debug_enabled = getLogger().isDebugEnabled();
+ Map objectModel = environment.getObjectModel();
SitemapRedirector redirector = new SitemapRedirector(environment);
<xsl:apply-templates/>
return internalRequest;
@@ -701,7 +702,7 @@
<xsl:apply-templates/>
<xsl:if test="position() = last()">
- throw new ResourceNotFoundException("No pipeline matched request: " + environment.getURIPrefix()+'/'+environment.getURI());
+ throw new ResourceNotFoundException("No pipeline matched request: " + environment.getURIPrefix() + environment.getURI());
</xsl:if>
} catch (ConnectionResetException cre) {
// Will be reported by CocoonServlet, rethrowing
@@ -712,7 +713,7 @@
getLogger().warn("404, try to process the error page", e);
try {
return error_process_<xsl:value-of select="$pipeline-position"/>_404 (redirector, environment,
- environment.getObjectModel(), e, internalRequest);
+ objectModel, e, internalRequest);
} catch (Exception ex) {
getLogger().warn("Sitemap Error Process", ex);
if (true) return false;
@@ -733,7 +734,7 @@
}
try {
return error_process_<xsl:value-of select="$pipeline-position"/>_500 (redirector, environment,
- environment.getObjectModel(), e, internalRequest);
+ objectModel, e, internalRequest);
} catch (Exception ex) {
getLogger().warn("Sitemap Error Process", ex);
if (true) return false;
No revision
No revision
1.1.2.1 +2 -2 xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Index: PipelineNode.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- PipelineNode.java 5 Mar 2002 08:26:23 -0000 1.1
+++ PipelineNode.java 17 Jun 2002 01:21:18 -0000 1.1.2.1
@@ -140,7 +140,7 @@
if (invokeNodes(children, env, context)) {
return true;
} else if (this.isLast) {
- String msg = "No pipeline matched request: " + env.getURIPrefix() + '/' + env.getURI();
+ String msg = "No pipeline matched request: " + env.getURIPrefix() + env.getURI();
getLogger().info(msg);
throw new ResourceNotFoundException(msg);
} else {
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org