Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
In directory james.mmbase.org:/tmp/cvs-serv9577
Modified Files:
Tag: MMBase-1_8
IncludeTag.java
Log Message:
should escape for use in xhtml
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow
Index: IncludeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/pageflow/IncludeTag.java,v
retrieving revision 1.66.2.7
retrieving revision 1.66.2.8
diff -u -b -r1.66.2.7 -r1.66.2.8
--- IncludeTag.java 18 Feb 2008 18:30:04 -0000 1.66.2.7
+++ IncludeTag.java 6 Mar 2008 13:56:06 -0000 1.66.2.8
@@ -35,7 +35,7 @@
*
* @author Michiel Meeuwissen
* @author Johannes Verelst
- * @version $Id: IncludeTag.java,v 1.66.2.7 2008/02/18 18:30:04 michiel Exp $
+ * @version $Id: IncludeTag.java,v 1.66.2.8 2008/03/06 13:56:06 michiel Exp $
*/
public class IncludeTag extends UrlTag {
@@ -251,8 +251,10 @@
default:
case Notfound.DEFAULT:
case Notfound.MESSAGE:
+ if ("".equals(result)) {
Xml xml = new Xml(Xml.ESCAPE);
- if ("".equals(result)) result = "The requested resource '" +
xml.transform(url) + "' is not available";
+ result = "The requested resource '" + xml.transform(url) +
"' is not available";
+ }
page = result;
}
break;
@@ -300,7 +302,8 @@
ServletContext sc = pageContext.getServletContext();
if (sc == null) log.error("Cannot retrieve ServletContext from
PageContext");
if (!
ResourceLoader.getWebRoot().getResource(relativeUrl).openConnection().getDoInput())
{
- handleResponse(404, "No such resource " + relativeUrl,
relativeUrl);
+ Xml xml = new Xml(Xml.ESCAPE);
+ handleResponse(404, "No such resource" +
xml.transform(relativeUrl), relativeUrl);
} else {
HttpServletRequestWrapper requestWrapper = new
HttpServletRequestWrapper(req);
if (log.isTraceEnabled()) {
@@ -375,7 +378,7 @@
Reader reader = ResourceLoader.getWebRoot().getReader(resource);
if (reader == null) {
- handleResponse(404, "No such resource " + resource, resource);
+ handleResponse(404, "No such resource to cite" + resource,
resource);
} else {
StringWriter writer = new StringWriter();
while (true) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
