Author: cmailleux
Date: Wed Oct 3 15:25:50 2007
New Revision: 1250
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1250&repname=
=3Dcorporate_portal_templates
Log:
Rollback changes made for container cache
This changes are still available in branch 5.1 of templates
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/double.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/groupsContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/usersContainer.inc
branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/double.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/double.jsp&rev=3D1250&repname=3Dcorporate_portal_templ=
ates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/double.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/double.jsp Wed Oct 3 15:25:5=
0 2007
@@ -21,6 +21,7 @@
<%@ include file=3D"include/header.inc"%>
<%@ include file=3D"include/top_banner.inc"%>
=
+<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
<td rowspan=3D"2" width=3D"159" valign=3D"top"><%@ include file=3D"inc=
lude/left_menu.inc"%></td>
@@ -29,24 +30,34 @@
<h1><%@ include file=3D"include/page_title_ctn.inc"%></h1>
</td>
</tr>
+</jesi:fragment>
=
<tr>
<td width=3D"50%" valign=3D"top">
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_1"/>
</jsp:include>
+ </jesi:fragment>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_1"/>
</jsp:include>
+ </jesi:fragment>
+
</td>
<td class=3D"verticaleline"><img src=3D"<content:contextURL/>/images/p=
ix.gif" width=3D"25" height=3D"12" alt=3D""/></td>
<td width=3D"50%" valign=3D"top">
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_2"/>
</jsp:include>
+ </jesi:fragment>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_2"/>
</jsp:include>
+ </jesi:fragment>
</td>
</tr>
</table>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/home.jsp&rev=3D1250&repname=3Dcorporate_portal_templat=
es
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/home.jsp Wed Oct 3 15:25:50 =
2007
@@ -22,6 +22,7 @@
<%@ include file=3D"include/top_banner.inc"%>
=
=
+<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td valign=3D"top"><%@ include file=3D"include/image.inc"%></td>
@@ -42,6 +43,9 @@
</tr>
</table>
<br/>
+</jesi:fragment>
+
+<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellpadding=3D"0" cellspacing=3D"0">
<tr>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"12" alt=3D""/></td>
@@ -66,6 +70,7 @@
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"10" hei=
ght=3D"12" alt=3D""/></td>
</tr>
</table>
+</jesi:fragment>
=
=
<jesi:fragment absolute=3D"true" group=3D'<%=3D"footer_TemplateId_"+jDat=
a.page().getPageTemplateID()%>' > =
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/box_webapps.inc&rev=3D1250&repname=3Dcorporate=
_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc (orig=
inal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/box_webapps.inc Wed O=
ct 3 15:25:50 2007
@@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><content:containerList name=3D'<%=3D"webappsContainer" + id%>' id=3D"w=
ebappsContainerList" parentContainerName=3D"boxContainer">
- <content:container cache=3D"false">
+ <content:container>
<content:applicationField name=3D'webapp' id=3D"webapp" display=3D=
"false" />
<logic:present name=3D"webapp" property=3D"object">
<bean:define id=3D"portletWindowBean" name=3D"webapp" property=
=3D"object" />
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/groupsContainer=
.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/groupsContainer.inc&rev=3D1250&repname=3Dcorpo=
rate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/groupsContainer.inc (=
original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/groupsContainer.inc W=
ed Oct 3 15:25:50 2007
@@ -1,4 +1,4 @@
-<%@ page import=3D"org.jahia.taglibs.container.ContainerTag" %><%--
+<%--
Copyright 2002-2006 Jahia Ltd
=
Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =
@@ -15,8 +15,6 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%
- //remove cache on this datas
- ContainerTag.disableCache(pageContext);
// the query from the user's request
String groupQueryString =3D request.getParameter("groupquery_" + id);
String gdisplay =3D request.getParameter("grouplistsize_" + id);
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/left_menu.inc&rev=3D1250&repname=3Dcorporate_p=
ortal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc (origin=
al)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/left_menu.inc Wed Oct=
3 15:25:50 2007
@@ -34,7 +34,6 @@
currentLevel++;
try {
if (linksContainerList !=3D null) {
- org.jahia.taglibs.container.ContainerTag.addContainerListDepen=
dency(pageContext, linksContainerList.getID());
Enumeration linksContainerEnum =3D linksContainerList.getConta=
iners();
isNotALink =3D linksContainerList.getContentContainerList().ge=
tPickedObject() =3D=3D null && isNotALink;
while (linksContainerEnum.hasMoreElements()) {
@@ -185,7 +184,7 @@
=
<content:absoluteContainerList name=3D"linkContainer" id=3D"linkContai=
nerList" pageLevel=3D"<%=3DString.valueOf(startLevel)%>">
<jahiaHtml:actionMenu name=3D"linkContainerList" namePostFix=3D"" =
resourceBundle=3D"jahiatemplates.Corporate_portal_templates">
- <content:container id=3D"linkContainer" cache=3D"off">
+ <content:container id=3D"linkContainer">
<content:pageField valueId=3D"link" name=3D"link" id=3D"topLin=
kField" />
<logic:notEmpty name=3D"link">
<logic:equal name=3D"link" property=3D"currentPage" value=
=3D"true">
@@ -217,7 +216,6 @@
mystate =3D "" + mystate + jData.params().getPageID();
}
%>
- <content:container-cache cacheKey=3D"<%=3D(String)mystate%>">
=
<logic:empty name=3D"link">
<logic:equal name=3D"currentRequest" property=3D"editMode"=
value=3D"true">
@@ -313,7 +311,6 @@
</logic:empty>
=
</logic:notEmpty>
- </content:container-cache>
</content:container>
<%
if (linkCount > 0) {
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/main_menu.inc&rev=3D1250&repname=3Dcorporate_p=
ortal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc (origin=
al)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/main_menu.inc Wed Oct=
3 15:25:50 2007
@@ -85,7 +85,7 @@
homePageTitle =3D"";
}
%>
- <content:container id=3D"topMenuContainer" cache=3D"false">
+ <content:container id=3D"topMenuContainer">
<content:pageField valueId=3D"topLink" name=3D"topLink" id=3D"=
topLinkField" />
<content:sharedLangTextField valueId=3D"myColorSet" name=3D"co=
lorSet" defaultValue=3D"<%=3DcolorSet%>" display=3D"false"/>
<logic:empty name=3D"topLink">
@@ -108,7 +108,6 @@
</logic:equal>
<% menuCount++; %>
=
- <content:container-cache cacheKeyName=3D"classpath">
<%
PageBean topLinkBean =3D (PageBean) pageContext.findAttrib=
ute("topLink");
JahiaPage topLink =3D topLinkBean.getJahiaPage();
@@ -163,7 +162,6 @@
</td>
</logic:equal>
</logic:empty>
- </content:container-cache>
</logic:notEmpty>
</content:container>
=
@@ -196,7 +194,7 @@
%>
=
<content:absoluteContainerList name=3D"topMenu" id=3D"topMenu" pageLevel=
=3D"1">
- <content:container id=3D"topMenuContainer" cacheKey=3D"menu">
+ <content:container id=3D"topMenuContainer">
<content:pageField valueId=3D"topLink" name=3D"topLink" id=3D"topL=
inkField" />
<logic:notEmpty name=3D"topLink">
<% menuCount++;
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/top_banner.inc&rev=3D1250&repname=3Dcorporate_=
portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc (origi=
nal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/top_banner.inc Wed Oc=
t 3 15:25:50 2007
@@ -30,7 +30,7 @@
%><table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" b=
order=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable"><%
if (jData.gui().isLogged()) {
%><tr><td>
- <jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
+ <jesi:fragment aclGroup=3D"true" ignore=3D"<%=3DignoreFragmentTag%>" >
<%@ include file=3D"admin_menu.inc"%>
</jesi:fragment>
</td></tr><%
@@ -38,10 +38,11 @@
}
=
%>
-
+<jesi:fragment aclGroup=3D"true" ignore=3D"<%=3DignoreFragmentTag%>" >
<% if (!thePrint) { %>
<tr>
<td>
+
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpaddi=
ng=3D"0">
<tr>
<td rowspan=3D"4" class=3D"adminmenu">
@@ -106,7 +107,6 @@
<%
}
%>
-
<table width=3D"<bean:write name=3D"pageWidth" filter=3D"false"/>" border=
=3D"0" cellspacing=3D"0" cellpadding=3D"0" class=3D"maintable">
<%
if (!thePrint) {
@@ -138,7 +138,6 @@
}
}
%>
-<jesi:fragment aclGroup=3D"true" alwaysInvalidate=3D"true">
<logic:equal name=3D"currentPage" property=3D"homePage" value=3D"false">
<tr>
<td class=3D"path" colspan=3D"2"><%
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/usersContainer.=
inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/include/usersContainer.inc&rev=3D1250&repname=3Dcorpor=
ate_portal_templates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/usersContainer.inc (o=
riginal)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/include/usersContainer.inc We=
d Oct 3 15:25:50 2007
@@ -1,4 +1,4 @@
-<%@ page import=3D"org.jahia.taglibs.container.ContainerTag" %><%--
+<%--
Copyright 2002-2006 Jahia Ltd
=
Licensed under the JAHIA COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (JCDD=
L), =
@@ -15,8 +15,6 @@
See the License for the specific language governing permissions and =
limitations under the License.
--%><%
- //remove cache on this datas
- ContainerTag.disableCache(pageContext);
// the query from the user assumed edit context
String userQueryString =3D request.getParameter("userquery_" + id);
String udisplay =3D request.getParameter("userlistsize_" + id);
Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/view/jsp/simple.jsp&rev=3D1250&repname=3Dcorporate_portal_templ=
ates
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/simple.jsp Wed Oct 3 15:25:5=
0 2007
@@ -21,21 +21,26 @@
<%@ include file=3D"include/header.inc"%>
<%@ include file=3D"include/top_banner.inc"%>
=
+<jesi:fragment aclGroup=3D"true">
<table width=3D"100%" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
<tr>
<td width=3D"159" valign=3D"top"><%@ include file=3D"include/left_menu=
.inc"%></td>
<% if (!thePrint && hasLeft !=3D 0) { %><td class=3D"verticaleline"><i=
mg src=3D"<content:contextURL/>/images/pix.gif" width=3D"25" height=3D"12" =
alt=3D""/></td><% } %>
<td width=3D"100%" valign=3D"top">
<h1><%@ include file=3D"include/page_title_ctn.inc"%></h1>
-
-
+</jesi:fragment>
+<jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/main_content.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_1"/>
</jsp:include>
+ </jesi:fragment>
+ <jesi:fragment aclGroup=3D"true">
<jsp:include page=3D"include/box.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"main_1"/>
<jsp:param name=3D"displayDetails" value=3D"true"/>
</jsp:include>
+ </jesi:fragment>
+ <jesi:fragment aclGroup=3D"true">
</td>
<td><img src=3D"<content:contextURL/>/images/pix.gif" width=3D"25" hei=
ght=3D"12" alt=3D""/></td>
<td valign=3D"top">
@@ -46,6 +51,7 @@
</td>
</tr>
</table>
+</jesi:fragment>
=
=
<jesi:fragment absolute=3D"true" group=3D'<%=3D"footer_TemplateId_"+jDat=
a.page().getPageTemplateID()%>' > =
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
