mcardle 2005/10/19 19:27:20 CEST
Modified files:
core/src/java/org/jahia/taglibs/esi JesiFragmentTag.java
Log:
* adds closing tag to esi:include (necessary for current proxy html parser)
Revision Changes Path
1.10 +3 -3
jahia/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java.diff?r1=1.9&r2=1.10&f=h
Index: JesiFragmentTag.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/taglibs/esi/JesiFragmentTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JesiFragmentTag.java 7 Oct 2005 14:59:57 -0000 1.9
+++ JesiFragmentTag.java 19 Oct 2005 17:27:19 -0000 1.10
@@ -114,7 +114,7 @@
//skip the body and just include a ESI:include tag
else {
//this.URL = getUrl(); MOVE IT ABOVE, but see if
can put it back here
- String esiFragmentIncludeTag = "<esi:include
src=\"" + this.URL + "\"/>";
+ String esiFragmentIncludeTag = "<esi:include
src=\"" + this.URL + "\"> esi:include tag here </esi:include>";
pageContext.getOut().write(esiFragmentIncludeTag);
if (logger.isDebugEnabled())
logger.debug("[esi]: appending following
esi command to current template (i.e. skeleton) : " + esiFragmentIncludeTag);
@@ -342,9 +342,9 @@
String aclGroupParam = getAclGroupParam();
//append the aclGroup query parameter (obtained
from the detected content) to the fragment's URL
pageContext.getOut().write("<esi:include src=\""
- + this.URL + "&"+JesiConst.ACL_GROUP+"="
+ aclGroupParam + "\"/>");
+ + this.URL + "&"+JesiConst.ACL_GROUP+"="
+ aclGroupParam + "\"> esi:include group tag here </esi:include>");
if (logger.isDebugEnabled())
- logger.debug("[esi]: Generating Template.
Added <esi:include src=\""+ this.URL + "&"+JesiConst.ACL_GROUP+"=" +
aclGroupParam + "\"/>");
+ logger.debug("[esi]: Generating Template.
Added <esi:include src=\""+ this.URL + "&"+JesiConst.ACL_GROUP+"=" +
aclGroupParam + "> esi:include group tag here </esi:include>");
//generate the new aclGroup identifier from the
request URL
fragmentKey += "_"+aclGroupParam;
if (logger.isDebugEnabled())
