You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2007/11/19 16:33:26 UTC

svn commit: r596328 - in /myfaces: core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java

Author: manolito
Date: Mon Nov 19 07:33:26 2007
New Revision: 596328

URL: http://svn.apache.org/viewvc?rev=596328&view=rev
Log:
MYFACES-1700

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
    myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java?rev=596328&r1=596327&r2=596328&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java Mon Nov 19 07:33:26 2007
@@ -23,6 +23,7 @@
 import org.apache.myfaces.renderkit.MyfacesResponseStateManager;
 import org.apache.myfaces.shared_impl.renderkit.html.HTML;
 import org.apache.myfaces.shared_impl.util.StateUtils;
+import org.apache.myfaces.shared_impl.config.MyfacesConfig;
 
 import javax.faces.application.StateManager;
 import javax.faces.context.FacesContext;
@@ -84,7 +85,11 @@
         responseWriter.startElement(HTML.INPUT_ELEM, null);
         responseWriter.writeAttribute(HTML.TYPE_ATTR, HTML.INPUT_TYPE_HIDDEN, null);
         responseWriter.writeAttribute(HTML.NAME_ATTR, STANDARD_STATE_SAVING_PARAM, null);
-        responseWriter.writeAttribute(HTML.ID_ATTR, STANDARD_STATE_SAVING_PARAM, null);
+
+        MyfacesConfig myfacesConfig = MyfacesConfig.getCurrentInstance(facescontext.getExternalContext());
+        if (myfacesConfig.isRenderViewStateId()) {
+            responseWriter.writeAttribute(HTML.ID_ATTR, STANDARD_STATE_SAVING_PARAM, null);
+        }
         responseWriter.writeAttribute(HTML.VALUE_ATTR, StateUtils.construct(savedState,
                 facescontext.getExternalContext()), null);
         responseWriter.endElement(HTML.INPUT_ELEM);

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java?rev=596328&r1=596327&r2=596328&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/config/MyfacesConfig.java Mon Nov 19 07:33:26 2007
@@ -75,7 +75,9 @@
     private static final String INIT_READONLY_AS_DISABLED_FOR_SELECT = "org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS";
     private static final boolean INIT_READONLY_AS_DISABLED_FOR_SELECT_DEFAULT = true;
 
-    
+    private static final String  INIT_PARAM_RENDER_VIEWSTATE_ID = "org.apache.myfaces.RENDER_VIEWSTATE_ID";
+    private static final boolean INIT_PARAM_RENDER_VIEWSTATE_ID_DEFAULT = true;
+
     private boolean _prettyHtml;
     private boolean _detectJavascript;
     private boolean _allowJavascript;
@@ -85,6 +87,7 @@
     private String _resourceVirtualPath;
     private boolean _checkExtensionsFilter;
     private boolean _readonlyAsDisabledForSelect;
+    private boolean _renderViewStateId;
 
     private static final boolean TOMAHAWK_AVAILABLE;
     private static final boolean MYFACES_IMPL_AVAILABLE;
@@ -161,6 +164,8 @@
 
         myfacesConfig.setReadonlyAsDisabledForSelect(getBooleanInitParameter(extCtx, INIT_READONLY_AS_DISABLED_FOR_SELECT,
                                                                  INIT_READONLY_AS_DISABLED_FOR_SELECT_DEFAULT));
+        myfacesConfig.setRenderViewStateId(getBooleanInitParameter(extCtx, INIT_PARAM_RENDER_VIEWSTATE_ID,
+                                                            INIT_PARAM_RENDER_VIEWSTATE_ID_DEFAULT));
 
         myfacesConfig.setConfigRefreshPeriod(getLongInitParameter(extCtx, INIT_PARAM_CONFIG_REFRESH_PERIOD,
                 INIT_PARAM_CONFIG_REFRESH_PERIOD_DEFAULT));
@@ -310,6 +315,14 @@
     public boolean isReadonlyAsDisabledForSelect()
     {
         return _readonlyAsDisabledForSelect;
+    }
+
+    public boolean isRenderViewStateId() {
+        return _renderViewStateId;
+    }
+
+    public void setRenderViewStateId(boolean renderViewStateId) {
+        _renderViewStateId = renderViewStateId;
     }
 
     public boolean isTomahawkAvailable()