Author: cmailleux
Date: Wed Oct 10 15:01:10 2007
New Revision: 804
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D804&repname=
=3Dcorporate_portal_templates_v2
Log:
Add some expiration for news (15minutes) and webapps (0s) correct a bug in=
advancedsearch
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/search_result_list.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/lastNews.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/webapps.inc
branches/JAHIA-5-0-SP-BRANCH/src/jsp/news.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/search_result_list=
.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/advsearch/search_result_list.inc&rev=3D804&repname=3Dcorpor=
ate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jsp/advsearch/search_result_list.inc (=
original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/advsearch/search_result_list.inc W=
ed Oct 10 15:01:10 2007
@@ -98,7 +98,7 @@
<div id=3D"searchFileDetail<%=3DfieldId%>"
style=3D"di=
splay: none;"> </div>
<%
} %>
- <br/><br/></li><% if ( i < displayedSearchHitCount-1 ){%><hr /=
><% } %></div>
+ <br/><br/></li><% if ( i < displayedHitCount-1 ){%><hr /><% } =
%></div>
<% } %>
</pg:item>
<% } %>
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/lastNews.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/lastNews.inc&rev=3D804&repname=3Dcorporate_portal_templ=
ates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jsp/box/lastNews.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/lastNews.inc Wed Oct 10 15:01:=
10 2007
@@ -1,3 +1,15 @@
+<%@ page import=3D"org.jahia.bin.Jahia" %>
+<%@ page import=3D"org.jahia.data.beans.ContainerBean" %>
+<%@ page import=3D"org.jahia.data.containers.*" %>
+<%@ page import=3D"org.jahia.registries.ServicesRegistry" %>
+<%@ page import=3D"org.jahia.resourcebundle.ResourceBundleMarker" %>
+<%@ page import=3D"org.jahia.security.license.LicenseActionChecker" %>
+<%@ page import=3D"org.jahia.services.categories.Category" %>
+<%@ page import=3D"org.jahia.services.pages.JahiaPage" %>
+<%@ page import=3D"org.jahia.taglibs.esi.JesiConst" %>
+<%@ page import=3D"org.jahia.taglibs.esi.JesiFragmentTag" %>
+<%@ page import=3D"java.text.SimpleDateFormat" %>
+<%@ page import=3D"java.util.*" %>
<%--
Copyright 2002-2006 Jahia Ltd
=
@@ -15,6 +27,10 @@
See the License for the specific language governing permissions and
limitations under the License.
--%><%
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute( JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE );
+ fragmentTag.setExpiration("900");
+ }
String categoriespackage=3D"org.jahia.actions.server.admin.categories.Mana=
geCategories";
boolean licenseEnabled =3D LicenseActionChecker.isAuthorizedByLicense(cate=
goriespackage, 0);
String windowSize =3D "10";
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/webapps.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/box/webapps.inc&rev=3D804&repname=3Dcorporate_portal_templa=
tes_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jsp/box/webapps.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/box/webapps.inc Wed Oct 10 15:01:1=
0 2007
@@ -14,7 +14,14 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
---%><content:containerList name=3D'<%=3D"webapps" + id%>' id=3D"webapps" =
parentContainerName=3D"boxContainer">
+--%>
+<%
+ if(Jahia.getSettings().isEsiCacheActivated()) {
+ JesiFragmentTag fragmentTag =3D (JesiFragmentTag) pageContext.getA=
ttribute( JesiConst.FRAGMENT_IN_USE, PageContext.REQUEST_SCOPE );
+ fragmentTag.setExpiration("0");
+ }
+%>
+<content:containerList name=3D'<%=3D"webapps" + id%>' id=3D"webapps" pare=
ntContainerName=3D"boxContainer">
<content:container id=3D"webappsContainer">
<content:applicationField name=3D'webapp' id=3D"webapp" display=3D=
"false" />
<jahiaHtml:actionMenu name=3D"webappsContainer" namePostFix=3D".we=
bapp"
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/news.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/news.jsp&rev=3D804&repname=3Dcorporate_portal_templates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=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/jsp/news.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/news.jsp Wed Oct 10 15:01:10 2007
@@ -20,7 +20,8 @@
<%@ include file=3D"common/top.inc"%>
=
<div class=3D"full2">
- <jesi:fragment aclGroup=3D"true">
+ <!-- This fragment will expire every 15 minutes -->
+ <jesi:fragment aclGroup=3D"true" expiration=3D"900">
<jsp:include page=3D"news/news.jsp" flush=3D"true">
<jsp:param name=3D"id" value=3D"full"/>
</jsp:include>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
