Author: sshyrkov Date: Mon Oct 15 11:23:24 2007 New Revision: 1256 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D1256&repname= =3Dcorporate_portal_templates Log: JAHIA-2528: Proper caching for static resources =
http://www.jahia.net/jira/browse/JAHIA-2528 Resolution: set 'Cache-control' and 'Expires' response headers to correctly= cache static resources under /jsp/jahia Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/template_css.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/template_css.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/src/view/jsp/template_css.jsp&rev=3D1256&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/template_css.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/src/view/jsp/template_css.jsp Mon Oct 15 1= 1:23:24 2007 @@ -14,25 +14,23 @@ 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. ---%><%@ page language=3D"java" contentType=3D"text/css" %><%@ taglib uri= =3D"contentLib" prefix=3D"content" %><%@ include file=3D"include/colors_dec= laration.inc"%><% - org.apache.log4j.Logger logger =3D org.apache.log4j.Logger.getLogger(g= etClass()); +--%><%@ page language=3D"java" contentType=3D"text/css" %><%@ include file= =3D"include/colors_declaration.inc"%><% +// org.apache.log4j.Logger logger =3D org.apache.log4j.Logger.getLogger= (getClass()); = - org.jahia.settings.SettingsBean siteSetting =3D org.jahia.bin.Jahia.ge= tSettings(); - if (siteSetting !=3D null) { - if (siteSetting.isDevelopmentMode()) { - logger.debug("We are in dev mode -> Disable browser cache for temp= late_css.jsp"); - response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 - response.setHeader("Pragma","no-cache"); //HTTP 1.0 - response.setDateHeader ("Expires", -1); - } else { - logger.debug("We are in production mode -> Set browser cache for t= emplate_css.jsp to 1 hour"); - long now =3D System.currentTimeMillis(); - response.setDateHeader("Expires", now + 3600000); // 1 hour - response.addHeader("Cache-Control", "max-age=3D3600"); - } - } - logger.debug("Opening template_css.jsp"); - String theURL =3D request.getContextPath() + request.getServletPath() = + "/.."; +org.jahia.settings.SettingsBean siteSetting =3D org.jahia.bin.Jahia.getSet= tings(); +if (siteSetting !=3D null && siteSetting.isDevelopmentMode()) { + response.setHeader("Cache-Control","no-store, no-cache, must-revalidat= e, max-age=3D0"); //HTTP 1.1 + response.addHeader("Cache-Control","post-check=3D0, pre-check=3D0"); + response.setHeader("Pragma","no-cache"); //HTTP 1.0 + response.setDateHeader ("Expires", -1); +} else { + response.setHeader("Cache-Control", "public, max-age=3D604800, post-ch= eck=3D7200, pre-check=3D604800"); + response.setHeader("Pragma", ""); + response.setDateHeader("Expires", System.currentTimeMillis() + 604800 = * 1000); // 7 days +} +// logger.debug("Opening template_css.jsp"); + String ctx =3D request.getContextPath(); + String theURL =3D ctx + request.getServletPath() + "/.."; = // COLORSET (SKINS) String colorSet=3D(String) request.getParameter("colorSet"); @@ -1294,19 +1292,19 @@ = table.searchResultListing th.sortable a { padding-right: 5px; - background-image: url(<content:serverHttpPath/>/jsp/jahia/engines/= images/arrow_off.png); + background-image: url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_of= f.png); background-repeat:no-repeat; } = table.searchResultListing th.order1 a { padding-right: 5px; - background-image: url(<content:serverHttpPath/>/jsp/jahia/engines/= images/arrow_down.png); + background-image: url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_do= wn.png); background-repeat:no-repeat; } = table.searchResultListing th.order2 a { padding-right: 5px; - background-image: url(<content:serverHttpPath/>/jsp/jahia/engines/= images/arrow_up.png); + background-image: url(<%=3Dctx%>/jsp/jahia/engines/images/arrow_up= .png); background-repeat:no-repeat; } = _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
