Merge pull request #1377 from jayasheelankumar/4.0.2.x

* Added http headers to disable proxy caching
* Updated version

build-bundles

@@ -2,7 +2,7 @@
 
 # REMEMBER TO CHANGE THIS VERSION #!!!!!!
 
-WOODSTOCK_VERSION="4.0.2.10"
+WOODSTOCK_VERSION="4.0.2.11"
 
 #====== remove existing copies=========
 rm -rf webui-jsf-*

master/build.properties

@@ -25,7 +25,7 @@
 # Version Information
 MajorVersion=4
 MinorVersion=0
-MicroVersion=.2.10
+MicroVersion=.2.11
 Qualifier=
 Version=${MajorVersion}.${MinorVersion}
 FullVersion=${Version}${MicroVersion}

webui/src/runtime/com/sun/webui/jsf/renderkit/html/HeadRenderer.java

@@ -32,6 +32,10 @@
 import com.sun.webui.jsf.util.JavaScriptUtilities;
 import com.sun.webui.jsf.util.RenderingUtilities;
 import com.sun.webui.jsf.util.ThemeUtilities;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>Renderer for a {@link Head} component.</p>
@@ -44,6 +48,9 @@ public class HeadRenderer extends AbstractRenderer {
      */
     private static final String stringAttributes[] = {"profile"}; //NOI18N
 
+    private static final String DATE_ONE =
+            (new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss zzz", Locale.US)).format(new Date(1));
+
     /**
      * <p>Render the appropriate element start, depending on whether the
      * <code>for</code> property is set or not.</p>
@@ -86,6 +93,14 @@ protected void renderAttributes(FacesContext context, UIComponent component,
             // Meta tags
             if (head.isMeta()) {
                 writer.write("\n"); //NOI18N
+
+                HttpServletResponse servletResponse = (HttpServletResponse) context.getCurrentInstance().getExternalContext().getResponse();
+                servletResponse.setHeader("Pragma", "no-cache");
+                servletResponse.setHeader("Cache-Control", "no-store");
+                servletResponse.setHeader("Cache-Control", "no-cache");
+                servletResponse.setHeader("Expires", DATE_ONE);
+                servletResponse.setHeader("X-Frame-Options", "SAMEORIGIN");
+
                 renderMetaTag("no-cache", "Pragma", writer, head);
                 renderMetaTag("no-cache", "Cache-Control", writer, head);
                 renderMetaTag("no-store", "Cache-Control", writer, head);