https://java.net/jira/browse/JAVASERVERFACES-1527 https://java.net/jira/browse/JAVASERVERFACES-2188 https://java.net/jira/browse/JAVASERVERFACES-2548

Author: Max Starets
Architect: Andy Schwartz
Reviewer/Tester: Ed Burns

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/facelets/tag/jsf/ComponentSupport.java
M       jsf-ri/src/main/java/com/sun/faces/facelets/tag/jsf/ComponentTagHandlerDelegateImpl.java
M       jsf-ri/src/main/java/com/sun/faces/facelets/tag/jstl/core/ForEachHandler.java
A       jsf-ri/src/main/java/com/sun/faces/facelets/tag/jsf/IterationIdManager.java

- Replace the single shot tracking mechanism for literal id generation
  within c:forEach with a stack based approach.  The single shot
  mechanism was never sufficient for nesting, which is not uncommon with
  c:forEach.


M       test/javaee6/pom.xml

- Fix version for this branch.

M       test/agnostic/facelets/core/src/main/webapp/WEB-INF/glassfish-web.xml

- Netbeans fodder.

A       test/agnostic/facelets/core/src/test/java/com/sun/faces/test/agnostic/facelets/core/ForEachIT.java
A       test/agnostic/facelets/core/src/main/java/com/sun/faces/test/agnostic/facelets/core/ForEachBean.java
A       test/agnostic/facelets/core/src/main/webapp/forEach
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_false_true_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_true_false_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_true_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_false_false_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_false_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_true_false_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/includedLiterallyWithParam.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_true_false_true_false_true_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_true_true_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_true_true_true_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_false_false_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_false_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_true_false_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_false_false_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/true_false_false_false_false_false_false_false_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/index.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/true_true_true_true_true_true_true_true_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_true_false_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_true_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_true_false_true_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_true_true_true.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/includedLiterally.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_true_false_false_false_true_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_true_false_false_false_true_false_true_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/false_false_false_false_false_false_false_false_false.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/includedDynamically01.xhtml
A       test/agnostic/facelets/core/src/main/webapp/forEach/includedDynamically02.xhtml

Given the following nine test axes, test an assortment of 22 of the 2^9 permutations.

  use ui:repeat

  use c:if

  use h:dataTable

  use ui:param

  h:form inside the c:forEach

  forEach is nested

  has NamingContainer around children

  use facelet inclusion around children with dynamic src

  use facelet inclusion around children with literal src

Note that all 16 permutations of the last four axes are tested.

Manfred agrees this is a minimally sufficient subset.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12622 761efcf2-d34d-6b61-9145-99dcacc3edf1
MostlySingletonSet implementation

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/context/StateContext.java
M       test/agnostic/dynamic/nbactions.xml
A       jsf-ri/src/main/java/com/sun/faces/util/MostlySingletonSet.java
A         test/unit/src/test/java/com/sun/faces/util/MostlySingletonTest.java

- After several iterations, performance gathering, and code review, this
  code is ready to commit.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12633 761efcf2-d34d-6b61-9145-99dcacc3edf1
Make ViewDeclarationLanguage.getStateManagementStrategy() return null in full state saving mode

The spec for ViewDeclarationLanguage.getStateManagementStrategy()
states:

  Implementations that provide the VDL for Facelets for JSF 2.0 and later
  must return non-null from this method.

Manfred fixed this spec violation in r9941 of
FaceletViewHandlingStrategy.java.

As a preventative measure for ADF, we are re-introducing the spec
violation, but only when running with the Trinidad StateManager.

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
M       test/web-profile/adf/basic/src/main/webapp/WEB-INF/web.xml

- Prior to this revision, this web.xml did not use the properties for
  state saving mode, project stage, and state saving method.  If this
  change causes the test to fail, I will first revert just the changes
  to web.xml.  If the test still fails, I'll revert the change to
  FaceletViewHandlingStrategy itself.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12636 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058

SECTION: Modified Files
----------------------------
M       test/pom.xml

####<Nov 7, 2013 6:05:04 PM UTC> <Info> <javax.enterprise.resource.webcontainer.jsf.config> <adc00ooo.us.oracle.com> <myserver> <RunLevelControllerThread-1383847495698> <<anonymous>> <> <> <1383847504290> <jsf.config.listener.version> <Initializing Mojarra 2.1.20-01 (-SNAPSHOT 20131107-1648 https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12646) for context '/guessNumber'>

- Verify this works for 12.1.3

M       jsf-demo/guessNumber/pom.xml

- Fix compiler version.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12648 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058


SECTION: Modified Files
----------------------------
M       test/pom.xml

- Add hudson-container-cleanup and hudson-container-prepare profiles.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12649 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058


SECTION: Modified Files
----------------------------
M       test/pom.xml

- Add integration-wls1213-cargo profile.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12650 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058


SECTION: Modified Files
----------------------------
M       test/pom.xml

- Set cargo version to match 2.2.x: 1.4.4.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12651 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058


SECTION: Modified Files
----------------------------
M       test/pom.xml

- Apply diffs from 2.2.x of integration-glassfish-cargo profile.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12652 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058


SECTION: Modified Files
----------------------------
M       test/agnostic/config/basic/src/test/java/com/sun/faces/test/agnostic/config/basic/ConfigFileIT.java
M       test/agnostic/config/basic/src/main/webapp/WEB-INF/config-lists-and-maps.xml
M       test/agnostic/config/basic/pom.xml

- Apply changes to this test in 2.2.x.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12653 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/JAVASERVERFACES-3058


SECTION: Modified Files
----------------------------
M       test/web-profile/adf/basic/src/test/java/com/sun/faces/test/adf/basic/FormOmittedTrinidadIT.java

- Remove leading "/" on suspicion that this is tripping up WLS where it
  doesn't trip up GlassFish.


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


SECTION: Modified Files
----------------------------
M       test/web-profile/pom.xml
D       test/web-profile/seam
D       test/web-profile/seam/src
D       test/web-profile/seam/src/test
D       test/web-profile/seam/src/test/java
D       test/web-profile/seam/src/test/java/com
D       test/web-profile/seam/src/test/java/com/sun
D       test/web-profile/seam/src/test/java/com/sun/faces
D       test/web-profile/seam/src/test/java/com/sun/faces/test
D       test/web-profile/seam/src/test/java/com/sun/faces/test/webprofile
D       test/web-profile/seam/src/test/java/com/sun/faces/test/webprofile/seam
D       test/web-profile/seam/src/test/java/com/sun/faces/test/webprofile/seam/Issue2405IT.java
D       test/web-profile/seam/src/main
D       test/web-profile/seam/src/main/java
D       test/web-profile/seam/src/main/java/com
D       test/web-profile/seam/src/main/java/com/sun
D       test/web-profile/seam/src/main/java/com/sun/faces
D       test/web-profile/seam/src/main/java/com/sun/faces/test
D       test/web-profile/seam/src/main/java/com/sun/faces/test/webprofile
D       test/web-profile/seam/src/main/java/com/sun/faces/test/webprofile/seam
D       test/web-profile/seam/src/main/java/com/sun/faces/test/webprofile/seam/Issue2405Bean.java
D       test/web-profile/seam/src/main/webapp
D       test/web-profile/seam/src/main/webapp/WEB-INF
D       test/web-profile/seam/src/main/webapp/WEB-INF/beans.xml
D       test/web-profile/seam/src/main/webapp/WEB-INF/web.xml
D       test/web-profile/seam/src/main/webapp/WEB-INF/glassfish-web.xml
D       test/web-profile/seam/src/main/webapp/issue2405.xhtml
D       test/web-profile/seam/pom.xml

- Remove seam module.



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


SECTION: Modified Files
----------------------------
A       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/WEB-INF/weblogic.xml

- Attempt to make this work on WLS by adding weblogic.xml with the
  input-charset config.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12656 761efcf2-d34d-6b61-9145-99dcacc3edf1
Refactoring:  Move container specific test request_char_encoding into glassfish and weblogic12c areas

M       test/glassfish/pom.xml
A       test/glassfish/request_char_encoding
A       test/glassfish/request_char_encoding/nbactions.xml
A       test/glassfish/request_char_encoding/src
A       test/glassfish/request_char_encoding/src/test
A       test/glassfish/request_char_encoding/src/test/java
A       test/glassfish/request_char_encoding/src/test/java/com
A       test/glassfish/request_char_encoding/src/test/java/com/sun
A       test/glassfish/request_char_encoding/src/test/java/com/sun/faces
A       test/glassfish/request_char_encoding/src/test/java/com/sun/faces/test
A       test/glassfish/request_char_encoding/src/test/java/com/sun/faces/test/glassfish
A       test/glassfish/request_char_encoding/src/test/java/com/sun/faces/test/glassfish/request_char_encoding
A       test/glassfish/request_char_encoding/src/test/java/com/sun/faces/test/glassfish/request_char_encoding/Issue2217IT.java
A       test/glassfish/request_char_encoding/src/main
A       test/glassfish/request_char_encoding/src/main/java
A       test/glassfish/request_char_encoding/src/main/java/hello1
A       test/glassfish/request_char_encoding/src/main/java/hello1/Hello.java
A       test/glassfish/request_char_encoding/src/main/java/com
A       test/glassfish/request_char_encoding/src/main/java/com/sun
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces/test
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces/test/Foo.java
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterById.java
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces/test/Bean.java
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterBase.java
A       test/glassfish/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterByClass.java
A       test/glassfish/request_char_encoding/src/main/resources
A       test/glassfish/request_char_encoding/src/main/webapp
A       test/glassfish/request_char_encoding/src/main/webapp/index.xhtml
A       test/glassfish/request_char_encoding/src/main/webapp/duke.waving.gif
A       test/glassfish/request_char_encoding/src/main/webapp/WEB-INF
A       test/glassfish/request_char_encoding/src/main/webapp/WEB-INF/web.xml
A       test/glassfish/request_char_encoding/src/main/webapp/WEB-INF/glassfish-web.xml
A       test/glassfish/request_char_encoding/src/main/webapp/response.xhtml
A       test/glassfish/request_char_encoding/pom.xml
M       test/weblogic12c/pom.xml
A       test/weblogic12c/request_char_encoding
A       test/weblogic12c/request_char_encoding/nbactions.xml
A       test/weblogic12c/request_char_encoding/src
A       test/weblogic12c/request_char_encoding/src/test
A       test/weblogic12c/request_char_encoding/src/test/java
A       test/weblogic12c/request_char_encoding/src/test/java/com
A       test/weblogic12c/request_char_encoding/src/test/java/com/sun
A       test/weblogic12c/request_char_encoding/src/test/java/com/sun/faces
A       test/weblogic12c/request_char_encoding/src/test/java/com/sun/faces/test
A       test/weblogic12c/request_char_encoding/src/test/java/com/sun/faces/test/weblogic12c
A       test/weblogic12c/request_char_encoding/src/test/java/com/sun/faces/test/weblogic12c/request_char_encoding
A       test/weblogic12c/request_char_encoding/src/test/java/com/sun/faces/test/weblogic12c/request_char_encoding/Issue2217IT.java
A       test/weblogic12c/request_char_encoding/src/main
A       test/weblogic12c/request_char_encoding/src/main/java
A       test/weblogic12c/request_char_encoding/src/main/java/hello1
A       test/weblogic12c/request_char_encoding/src/main/java/hello1/Hello.java
A       test/weblogic12c/request_char_encoding/src/main/java/com
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces/test
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterById.java
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces/test/Foo.java
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces/test/Bean.java
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterBase.java
A       test/weblogic12c/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterByClass.java
A       test/weblogic12c/request_char_encoding/src/main/resources
A       test/weblogic12c/request_char_encoding/src/main/webapp
A       test/weblogic12c/request_char_encoding/src/main/webapp/index.xhtml
A       test/weblogic12c/request_char_encoding/src/main/webapp/duke.waving.gif
A       test/weblogic12c/request_char_encoding/src/main/webapp/WEB-INF
A       test/weblogic12c/request_char_encoding/src/main/webapp/WEB-INF/weblogic.xml
A       test/weblogic12c/request_char_encoding/src/main/webapp/WEB-INF/web.xml
A       test/weblogic12c/request_char_encoding/src/main/webapp/response.xhtml
A       test/weblogic12c/request_char_encoding/pom.xml
M       test/web-profile/lifecycle/pom.xml
D       test/web-profile/lifecycle/request_char_encoding
D       test/web-profile/lifecycle/request_char_encoding/nbactions.xml
D       test/web-profile/lifecycle/request_char_encoding/src
D       test/web-profile/lifecycle/request_char_encoding/src/test
D       test/web-profile/lifecycle/request_char_encoding/src/test/java
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun/faces
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun/faces/test
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun/faces/test/agnostic
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun/faces/test/agnostic/lifecycle
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun/faces/test/agnostic/lifecycle/request_char_encoding
D       test/web-profile/lifecycle/request_char_encoding/src/test/java/com/sun/faces/test/agnostic/lifecycle/request_char_encoding/Issue2217IT.java
D       test/web-profile/lifecycle/request_char_encoding/src/main
D       test/web-profile/lifecycle/request_char_encoding/src/main/java
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/hello1
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/hello1/Hello.java
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces/test
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces/test/Foo.java
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterById.java
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces/test/Bean.java
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterBase.java
D       test/web-profile/lifecycle/request_char_encoding/src/main/java/com/sun/faces/test/FooConverterByClass.java
D       test/web-profile/lifecycle/request_char_encoding/src/main/resources
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/index.xhtml
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/duke.waving.gif
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/WEB-INF
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/WEB-INF/weblogic.xml
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/WEB-INF/web.xml
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/WEB-INF/glassfish-web.xml
D       test/web-profile/lifecycle/request_char_encoding/src/main/webapp/response.xhtml
D       test/web-profile/lifecycle/request_char_encoding/pom.xml


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12657 761efcf2-d34d-6b61-9145-99dcacc3edf1
Backport 17169802 from 2.2.x to 2.1.20-01, at the request of Liang
Zhang.

------------------------------------------------------------------------
r12253 | edburns | 2013-07-24 03:02:59 +0000 (Wed, 24 Jul 2013) | 54 lines

bugdb 17169802 Defensive programming to protect against garbage in

- forward port from 2.1.x rolling revision r12251.


SECTION: Modified Files
----------------------------
M       jsf-api/src/main/java/javax/faces/component/UINamingContainer.java

- The spec for UINamingContainer.getSeparatorChar() says:

  http://docs.oracle.com/javaee/6/api/javax/faces/component/UINamingContainer.html#getSeparatorChar(javax.faces.context.FacesContext)

  Parameters:
    context - the FacesContext for the current request

  Yet, this method is being called from a static initializer block from
  RichFaces as shown in this stack trace:

javax.faces.component.UINamingContainer.getSeparatorChar(UINamingContainer.java:129)
at org.richfaces.util.Util$NamingContainerDataHolder.<clinit>(Util.java:110)
at java.lang.Class.forName0(Native Method)
at java.lang.Class.forName(Class.java:270)
at
com.oracle.injection.provider.weld.BasicResourceLoader.classForName(BasicResourceLoader.java:27)
at org.jboss.weld.bootstrap.BeanDeployer.loadClass(BeanDeployer.java:107)
at org.jboss.weld.bootstrap.BeanDeployer.addClass(BeanDeployer.java:77)
at org.jboss.weld.bootstrap.BeanDeployer.addClasses(BeanDeployer.java:135)
at
org.jboss.weld.bootstrap.BeanDeployment.createBeans(BeanDeployment.java:184)
at org.jboss.weld.bootstrap.WeldBootstrap.deployBeans(WeldBootstrap.java:349)
at
com.oracle.injection.provider.weld.WeldInjectionContainer.deploy(WeldInjectionContainer.java:99)
at
com.oracle.injection.integration.CDIAppDeploymentExtension.initCdi(CDIAppDeploymentExtension.java:68)
at
com.oracle.injection.integration.CDIAppDeploymentExtension.activate(CDIAppDeploymentExtension.java:47)
at
weblogic.application.internal.flow.AppDeploymentExtensionFlow.activate(AppDeploymentExtensionFlow.java:37)
at
weblogic.application.internal.BaseDeployment$2.next(BaseDeployment.java:729)
at
weblogic.application.utils.StateMachineDriver.nextState(StateMachineDriver.java:42)
at
weblogic.application.internal.BaseDeployment.activate(BaseDeployment.java:258)

Note the <clinit>, indicating a static initializer block.

  It is not valid to call FacesContext.getCurrentInstance() from within
  a static initializer block.

  This fix defensively accounts for this misuse and returns
  NamingContainer.SEPARATOR_CHAR.

------------------------------------------------------------------------


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12687 761efcf2-d34d-6b61-9145-99dcacc3edf1
17859556 Add additional pattern to nameContainsForbiddenString()

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceManager.java

- Add "./.." to list of patterns in nameContainsForbiddenString().


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/2.1.20-01@12692 761efcf2-d34d-6b61-9145-99dcacc3edf1
Start development toward 2.1.20-02

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