Port to 2.2.x


SECTION: Modified Files
----------------------------
M       test/servlet30/dynamic/src/main/webapp/moveComponent2.xhtml

- Revert mistakenly committed changes that invalidated this test.

A       test/servlet30/dynamic/nbactions.xml

- NetBeans support.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13872 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3504, jsf.js contains debug code (2.2 backport)

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

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13884 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3510, look for the real child index when state saving dynamic components

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

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13896 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3511, if the URL could not be opened as a JarFile it is not a JarFile so make it so we return null

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13898 761efcf2-d34d-6b61-9145-99dcacc3edf1
JAVASERVERFACES-3515: To fix WLS MT issue - Bug 19859648 - MT - STUCK THREADS ON WEAKHASHMAP.GET ACCESSING MEDREC ON 2 PARTITIONS IN PARALL

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13910 761efcf2-d34d-6b61-9145-99dcacc3edf1
Port 3483 from branches/2.2.8 to branches/MOJARRA_2_2X_ROLLING

------------------------------------------------------------------------
r13742 | edburns | 2014-10-10 20:30:03 +0000 (Fri, 10 Oct 2014) | 43 lines

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


SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/config/configprovider/MetaInfFaceletTaglibraryConfigProvider.java

- Replace spaces with %20s.

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

- Introduce a constant

+    private static final String FACES_CONFIG_EXTENSION = 
+            ".faces-config.xml";

- Use the constant

-            URL [] urlArray = Classpath.search("META-INF/", ".faces-config.xml");
+            URL [] urlArray = Classpath.search("META-INF/", FACES_CONFIG_EXTENSION);

- here is an additional bug I'm fixing with this commit

-                    if (p.endsWith(".taglib.xml")) {
+                    if (p.endsWith(FACES_CONFIG_EXTENSION)) {

  We should not be picking up .taglib.xml files in this list.  Doing so
  would cause problems because everything we pick up in this list is
  parsed as a faces-config file.  Trying to parse a faces-config file as
  a .taglib.xml file would fail and cause non-deployment.

A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes
A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF
A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF/taglib with spaces in name.taglib.xml

- test fodder, only to exercise deployment-time code.

A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF/spaceInName.xhtml

- test fodder, not actually used.




git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13940 761efcf2-d34d-6b61-9145-99dcacc3edf1
JAVASERVERFACES-3493 port 3483 to 2.2.x

M       jsf-ri/src/main/java/com/sun/faces/config/configprovider/MetaInfFaceletTaglibraryConfigProvider.java
M       jsf-ri/src/main/java/com/sun/faces/config/configprovider/MetaInfFacesConfigResourceProvider.java
D       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes
D       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF
D       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF/taglib with spaces in name.taglib.xml
D       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF/spaceInName.xhtml

- Revert fix for 3483-SpacesInTaglibName due to test failures in Windows.


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

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13945 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3520, [PORT 2.2x] Duplicates of ID's when h:selectManyCheckbox contains javax.faces.model.SelectItemGroup elements

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13948 761efcf2-d34d-6b61-9145-99dcacc3edf1
M       jsf-ri/src/main/java/com/sun/faces/config/configprovider/MetaInfFaceletTaglibraryConfigProvider.java
M       jsf-ri/src/main/java/com/sun/faces/config/configprovider/MetaInfFacesConfigResourceProvider.java

- Protect from spaces in taglib file names

A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes
A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF
A       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/classes/META-INF/spaceInName.xhtml

- Test fodder


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13957 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3481, [PORT 2.2.x] Fix StateContext to correctly pass parent to childAddedToSameParentAsBefore

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13958 761efcf2-d34d-6b61-9145-99dcacc3edf1
Reverting out issue #3480

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

After problems with this approach at the customer site I am reverting
this from 2.2.x and will develop the fix on the trunk, backporting first
to branches/2.1.20 for the purpose of generating a fix for the customer
site.


SECTION: Modified Files
----------------------------
M       jsf-api/src/main/java/javax/faces/component/UIViewRoot.java
M       jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/ScriptStyleBaseRenderer.java
M       test/agnostic/facelets/cc/src/main/java/com/sun/faces/test/agnostic/facelets/composite/TestBean.java
M       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/web.xml


D       test/agnostic/facelets/cc/src/test/java/com/sun/faces/test/agnostic/facelets/composite/Issue19667737IT.java
D       test/agnostic/facelets/cc/src/main/webapp/resources/ccAttrsValue
D       test/agnostic/facelets/cc/src/main/webapp/resources/ccAttrsValue/cic5573cmp.xhtml
D       test/agnostic/facelets/cc/src/main/webapp/ccAttrsValuePrependIdTrue.xhtml
D       test/agnostic/facelets/cc/src/main/webapp/WEB-INF/asw-taglib.xml
D       test/agnostic/facelets/cc/src/main/webapp/ccAttrsValue.xhtml

- Revert from 2.2.x.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13970 761efcf2-d34d-6b61-9145-99dcacc3edf1
JAVASERVERFACES-3540: [PORT to 2.2.x] JAVASERVERFACES-3485

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13993 761efcf2-d34d-6b61-9145-99dcacc3edf1
revert the change of JAVASERVERFACES-3540 due to the test case Issue19667737IT failure

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13994 761efcf2-d34d-6b61-9145-99dcacc3edf1
JAVASERVERFACES-3540: submit again, run wls test locally and the added test passed

git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2X_ROLLING@13995 761efcf2-d34d-6b61-9145-99dcacc3edf1
Fixes https://java.net/jira/browse/JAVASERVERFACES-3554, reverting fix for #3351 as it causes a regression

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

Port to 2.2.x from trunk:

  ------------------------------------------------------------------------
  r13989 | edburns | 2014-11-26 00:11:23 +0000 (Wed, 26 Nov 2014) | 19 lines

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


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

- Take a different approach.  Simplify the search code.

  Tested with new harness in two permutations:

++++++++++++++++++++SECTION: -Dwebapp.projectStage=Development -Dwebapp.stateSavingMethod=server -Dwebapp.partialStateSaving=false
++++++++++++++++++++SECTION: -Dwebapp.projectStage=Development -Dwebapp.stateSavingMethod=client -Dwebapp.partialStateSaving=true

  No errors or failures.

  Also ran through tests from Bug 20064382 on multiple tenants.


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


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