http://java.net/jira/browse/JAVASERVERFACES-3250

- Apply refactoring at Manfred's suggestion.

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/flow/FlowHandlerImpl.java
M       jsf-ri/src/main/java/com/sun/faces/flow/FlowCDIContext.java

- Encapsulate the contextual and creational maps in a helper class.
  This minimizes calls to the session and allows for easily dirtying the
  session regardless of distributable or not.

A       jsf-ri/src/main/java/com/sun/faces/context/AlwaysPuttingSessionMap.java

- Instead of having the existing SessionMap have a distributable flag,
  have a variant of the SessionMap that omits the "only put if the value
  is different" optimization.

M       jsf-ri/src/main/java/com/sun/faces/context/ExternalContextImpl.java

- Use the AlwaysPuttingSessionMap if distributable.

M       jsf-ri/src/main/java/com/sun/faces/context/SessionMap.java

- Revert previous modifications

- Make HttpSession getSession(boolean createNew) protected so it can be
  accessed from the subclass.



git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13197 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3191

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/application/view/ViewScopeContextManager.java
M       jsf-ri/src/main/java/com/sun/faces/application/view/ViewScopeManager.java

- Apply refactoring to ensure the ViewScoped beans get replicated.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13198 761efcf2-d34d-6b61-9145-99dcacc3edf1
Disabled this FacesValidator as it causes the deployment to fail on WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13199 761efcf2-d34d-6b61-9145-99dcacc3edf1
Make sure we don't add HtmlUnit to deployment (it should only be used for testing)

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13200 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3266

SECTION: Modified Files
----------------------------
M       test/servlet30/systest/src/main/java/com/sun/faces/annotation/AnnotationTestBean.java

- comment out some test code that now fails due to this commit:

r13199 | mriem | 2014-05-02 10:41:00 -0400 (Fri, 02 May 2014) | 1 line

Disabled this FacesValidator as it causes the deployment to fail on WLS





git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13201 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3184

Forward port fix for JAVASERVERFACES-3031 from 2.1.x to 2.2.x.

Ran full tests on GlassFish 3.1.2.2 and 4.0.

Author: Neil Griffin

Review notes: Ed Burns. These notes are a combination of descriptions
and questions.

SECTION: Modified Files
----------------------------
M jsf-ri/src/main/java/com/sun/faces/context/RequestParameterMap.java

- Make it so the namespaceParameters context-param will cause the
  correct interrogation of the ViewRoot for its containerClientId if and
  only if it is an instance of NamingContainer.

M common/ant/dependencies.xml

- Replace download.java.net with <search.maven.org/remotecontent?filepath=>.

M jsf-ri/src/main/java/com/sun/faces/config/WebConfiguration.java

- Add com.sun.faces.namespaceParameters.

M jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/FormRenderer.java

- in encodeBegin(), check the transient ivar corresponding to the
  namespaceParameters context-param, which is set in the ctor, and if it
  is set, append the return from viewRoot.getContainerClientId() to the
  attribute name.

M jsf-ri/src/main/java/com/sun/faces/renderkit/ServerSideStateHelper.java
M jsf-ri/src/main/java/com/sun/faces/renderkit/ClientSideStateHelper.java

- in the ctor, query the namespaceParameters context-param

- in the writeState(), use it.

M jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/AjaxBehaviorRenderer.java

In AjaxBehaviorRenderer in the buildAjaxCommand() method, the operative
change is to add an additional condition to an if, for
namespaceParameters.

M jsf-api/src/main/resources/jsf.js

- Use com.sun.faces.namespaceParameters.

- Add method getEncodedUrlElement(). This seems to be necessary because

              var encodedUrlElement = form['javax.faces.encodedURL'];

  must not be enough, so this code makes it go through all the elements
  of the current form looking for it.

- in request(), prepend the namingContainerId option to all arguments,
  being careful not to miss any.


M test/agnostic/pom.xml

- wire up new test

A test/agnostic/ajax-namespace
A test/agnostic/ajax-namespace/src
A test/agnostic/ajax-namespace/src/test
A test/agnostic/ajax-namespace/src/test/java
A test/agnostic/ajax-namespace/src/test/java/com
A test/agnostic/ajax-namespace/src/test/java/com/sun
A test/agnostic/ajax-namespace/src/test/java/com/sun/faces
A test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test
A test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test/agnostic
A test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test/agnostic/ajax_namespace
A test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test/agnostic/ajax_namespace/Issue3031IT.java
A test/agnostic/ajax-namespace/src/main
A test/agnostic/ajax-namespace/src/main/resources
A test/agnostic/ajax-namespace/src/main/webapp
A test/agnostic/ajax-namespace/src/main/webapp/index.xhtml
A test/agnostic/ajax-namespace/src/main/webapp/WEB-INF
A test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/glassfish-web.xml
A test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/faces-config.xml
A test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/beans.xml
A test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/web.xml
A test/agnostic/ajax-namespace/src/main/java
A test/agnostic/ajax-namespace/src/main/java/com
A test/agnostic/ajax-namespace/src/main/java/com/sun
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/NamingContainerViewRoot.java
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/ApplicationFactoryImpl.java
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/UserBean.java
A test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/ApplicationImpl.java
A test/agnostic/ajax-namespace/pom.xml
A test/agnostic/ajax-namespace/nbactions.xml

- new test
Sending common/ant/dependencies.xml
Sending jsf-api/src/main/resources/jsf.js
Sending jsf-ri/src/main/java/com/sun/faces/config/WebConfiguration.java
Sending jsf-ri/src/main/java/com/sun/faces/context/RequestParameterMap.java
Sending jsf-ri/src/main/java/com/sun/faces/renderkit/ClientSideStateHelper.java
Sending jsf-ri/src/main/java/com/sun/faces/renderkit/ServerSideStateHelper.java
Sending jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/AjaxBehaviorRenderer.java
Sending jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/FormRenderer.java
Adding test/agnostic/ajax-namespace
Adding test/agnostic/ajax-namespace/nbactions.xml
Adding test/agnostic/ajax-namespace/pom.xml
Adding test/agnostic/ajax-namespace/src
Adding test/agnostic/ajax-namespace/src/main
Adding test/agnostic/ajax-namespace/src/main/java
Adding test/agnostic/ajax-namespace/src/main/java/com
Adding test/agnostic/ajax-namespace/src/main/java/com/sun
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/ApplicationFactoryImpl.java
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/ApplicationImpl.java
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/NamingContainerViewRoot.java
Adding test/agnostic/ajax-namespace/src/main/java/com/sun/faces/test/agnostic/ajax_namespace/UserBean.java
Adding test/agnostic/ajax-namespace/src/main/resources
Adding test/agnostic/ajax-namespace/src/main/webapp
Adding test/agnostic/ajax-namespace/src/main/webapp/WEB-INF
Adding test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/beans.xml
Adding test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/faces-config.xml
Adding test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/glassfish-web.xml
Adding test/agnostic/ajax-namespace/src/main/webapp/WEB-INF/web.xml
Adding test/agnostic/ajax-namespace/src/main/webapp/index.xhtml
Adding test/agnostic/ajax-namespace/src/test
Adding test/agnostic/ajax-namespace/src/test/java
Adding test/agnostic/ajax-namespace/src/test/java/com
Adding test/agnostic/ajax-namespace/src/test/java/com/sun
Adding test/agnostic/ajax-namespace/src/test/java/com/sun/faces
Adding test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test
Adding test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test/agnostic
Adding test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test/agnostic/ajax_namespace
Adding test/agnostic/ajax-namespace/src/test/java/com/sun/faces/test/agnostic/ajax_namespace/Issue3031IT.java
Sending test/agnostic/pom.xml
Transmitting file data .....................
Committed revision 12819. 


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13202 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting for resolution on WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13203 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting for resolution on WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13204 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3268


SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/el/ImplicitObjectELResolver.java

- Ensure getFeatureDescriptors() returns correct top level objects.

A       test/servlet30/el/src/main/java/com/sun/faces/test/servlet30/el/GetFeatureDescriptorsBean.java
A       test/servlet30/el/src/test/java/com/sun/faces/test/servlet30/el/Issue3268IT.java
A       test/servlet30/el/src/main/webapp/getFeatureDescriptors.xhtml

- Automated test.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13205 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting on resolution for WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13206 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting on resolution for WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13207 761efcf2-d34d-6b61-9145-99dcacc3edf1
Commenting out while waiting for resolution on WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13208 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting on resolution for WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13209 761efcf2-d34d-6b61-9145-99dcacc3edf1
@Resource injection into a PhaseListener is not required to be supported

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13210 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting on resolution for WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13211 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting on resolution for WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13212 761efcf2-d34d-6b61-9145-99dcacc3edf1
Ignoring while waiting on resolution for WLS

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13213 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fix POM file

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13214 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3262 FlashScoped and clustering

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/util/ByteArrayGuardAESCTR.java

- Make this cluster friendly by adding support for an env-entry to specify the secret key
  for encrypting the flash cookie.

  Here's how you use it.

+    <env-entry>
+        <env-entry-name>jsf/FlashSecretKey</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <!-- http://www.digitalsanctuary.com/aes-key-generator.php -->
+        <env-entry-value>YeMYsp5+BDTvzL6A5n40IusWI9E8Jqr9q/hk5GU53RE=</env-entry-value>
+    </env-entry>

  If you're going to use client side state saving, you also need this.

+    <env-entry>
+        <env-entry-name>jsf/ClientSideSecretKey</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <!-- http://www.digitalsanctuary.com/aes-key-generator.php -->
+        <env-entry-value>vxI50oNETIH5iSsUPFBvzP0913W8fy8lwZ/LT6caXyI= </env-entry-value>
+    </env-entry>

M       jsf-ri/src/main/java/com/sun/faces/context/flash/ELFlash.java

- Introduce some cluster awareness.  If we are in a cluster mode, use an
  HttpSessionActivationListener impl, SessionHelper, that essentially
  uses the session to transport the flash data to the other node on
  session activation.  This code is not touched in a non-cluster environment.

A         jsf-ri/src/main/java/com/sun/faces/context/flash/SessionHelper.java

- Uses the HttpSession to store the flashInnerMap in the case of session
  activation.

M       jsf-ri/src/main/java/com/sun/faces/context/flash/FlashELResolver.java

- Remove some incorrect assumptions.

  getValue() should take no action because the ImplicitObjectELResolver
  handles the the case of getValue(null, "flash");

  We should not be storing the flash in the session.  It is an
  application scoped singleton.

M       jsf-ri/src/main/java/com/sun/faces/el/ELConstants.java

- Add FLASH, update values accordingly.

M       jsf-ri/src/main/java/com/sun/faces/el/ImplicitObjectELResolver.java

- add flash to implicitNames.

- Add FLASH to big switch statement.

M       test/cluster/servlet25/flash/pom.xml

- Add basic test, copied from agnostic and improved with
  cluster-exercising capabilities.

M       test/agnostic/flash/basic/nbactions.xml
A       test/servlet30/el/nbactions.xml

- Make it so NetBeans Debug Focused Test works.

A       test/cluster/servlet25/flash/basic
A       test/cluster/servlet25/flash/basic/src
A       test/cluster/servlet25/flash/basic/src/test
A       test/cluster/servlet25/flash/basic/src/test/java
A       test/cluster/servlet25/flash/basic/src/test/java/com
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash/basic
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash/basic/FlashMessagesIT.java
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash/basic/FlashViewParamIT.java
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash/basic/Issue2862IT.java
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash/basic/KeepMessagesIT.java
A       test/cluster/servlet25/flash/basic/src/test/java/com/sun/faces/test/cluster/flash/basic/Issue2973IT.java
A       test/cluster/servlet25/flash/basic/src/main
A       test/cluster/servlet25/flash/basic/src/main/webapp
A       test/cluster/servlet25/flash/basic/src/main/webapp/flash02.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/flashDropCookie3.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/messagePage.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/issue2973
A       test/cluster/servlet25/flash/basic/src/main/webapp/issue2973/page1.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/issue2973/page2.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/flashKeepMessages01.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/WEB-INF
A       test/cluster/servlet25/flash/basic/src/main/webapp/WEB-INF/weblogic.xml
A       test/cluster/servlet25/flash/basic/src/main/webapp/WEB-INF/web.xml
A       test/cluster/servlet25/flash/basic/src/main/webapp/WEB-INF/glassfish-web.xml
A       test/cluster/servlet25/flash/basic/src/main/webapp/flashDropCookie.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/flashKeepMessages02.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/keepMessages.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/flash01.xhtml
A       test/cluster/servlet25/flash/basic/src/main/webapp/flashDropCookie2.xhtml
A       test/cluster/servlet25/flash/basic/src/main/java
A       test/cluster/servlet25/flash/basic/src/main/java/com
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash/basic
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash/basic/FlashMessagesBean.java
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash/basic/FlashDropCookieBean.java
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash/basic/AddMessageBean.java
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash/issue2973
A       test/cluster/servlet25/flash/basic/src/main/java/com/sun/faces/test/cluster/flash/issue2973/Bean.java
A       test/cluster/servlet25/flash/basic/src/main/resources
A       test/cluster/servlet25/flash/basic/pom.xml
A       test/cluster/servlet25/flash/basic/nbactions.xml

- New test.



git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13215 761efcf2-d34d-6b61-9145-99dcacc3edf1
Bind to 127.0.0.1 in an effort to make offending nodes work

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13216 761efcf2-d34d-6b61-9145-99dcacc3edf1