http://java.net/jira/browse/GLASSFISH-20122

To preverve backward compatibility with the now deprecated Facelets
ResourceResolver, ensure it gets consulted on ViewHandler0.viewExists().

r=mriem

SECTION: Modified Files
----------------------------
M       jsf-ri/src/main/java/com/sun/faces/facelets/impl/DefaultFaceletFactory.java
M       jsf-ri/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
M       jsf-demo/sandbox/flow_and_contract/app/pom.xml
M       jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/OutcomeTargetRenderer.java

- Unrelated change.  Don't renderd the flow attributes on outcomeTarget
  components unless there are flows.

D       jsf-demo/sandbox/flow_and_contract/app/src/main/webapp/contracts
D       jsf-demo/sandbox/flow_and_contract/app/src/main/webapp/contracts/leftNav
D       jsf-demo/sandbox/flow_and_contract/app/src/main/webapp/contracts/topNav

- Unrelated change, the focus of this demo changed so that now the flows
  and contracts are bundled in jars, not with the app.

A       test/agnostic/vdl/facelets/resource-resolver
A       test/agnostic/vdl/facelets/resource-resolver/nbactions.xml
A       test/agnostic/vdl/facelets/resource-resolver/src
A       test/agnostic/vdl/facelets/resource-resolver/src/test
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl/facelets
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver
A       test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver/VerifyResourceResolverUsageIT.java
A       test/agnostic/vdl/facelets/resource-resolver/src/main
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl/facelets
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver
A       test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver/TestResolver.java
A       test/agnostic/vdl/facelets/resource-resolver/src/main/resources
A       test/agnostic/vdl/facelets/resource-resolver/src/main/webapp
A       test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/WEB-INF
A       test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/WEB-INF/web.xml
A       test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/WEB-INF/glassfish-web.xml
A       test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/a.xhtml
A       test/agnostic/vdl/facelets/resource-resolver/pom.xml

- New test


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11850 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20122

Committed to MOJARRA_2_2_0_GLASSFISH_4_0.

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

- Found by jsp-flash systest-per-webapp.  




git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11851 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20232


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

- Instead of polling the config manager to see if there are flows, use
  the addFlow() method.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11852 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20123

SECTION: Modified Files
----------------------------
M       jsf-ri/build.xml

- change mvn.deploy.release.local and mvn.deploy.release to depend on m14.

M       jsf-ri/mojarra-jsf-impl.bnd

- change OSGi Implementation-Version to be 2.2.0-m14.

- change OSGi Bundle-Version to be 2.1.99.b14

M       common/ant/maven.xml

- If the build.type is not -SNAPSHOT, activate the check-module property
  when invoking maven.  This causes the 

              <groupId>org.glassfish.build</groupId>
              <artifactId>spec-version-maven-plugin</artifactId>
              <version>1.1</version>

  plugin to be invoked, as shown in this output

[INFO] Building jar: /Users/ejburns/Documents/JavaEE/workareas/mojarra-MOJARRA_2_2_0_GLASSFISH_4_0/jsf-api/build/mvn/target/javax.faces-api-2.2-m14.jar
[INFO] [build-helper:attach-artifact {execution: attach-artifacts}]
[INFO] [spec-version:check-module {execution: default}]
[INFO] [source:jar-no-fork {execution: attach-sources}]
[INFO] Building jar: /Users/ejburns/Documents/JavaEE/workareas/mojarra-MOJARRA_2_2_0_GLASSFISH_4_0/jsf-ri/build/mvn/target/javax.faces-2.2.0-m14.jar
[INFO] [build-helper:attach-artifact {execution: attach-artifacts}]
[INFO] [spec-version:check-module {execution: default}]
[INFO] [source:jar-no-fork {execution: attach-sources}]

M       common/ant/template/jsf-impl-pom-template.xml
M       common/ant/template/jsf-api-pom-template.xml

- invoke the spec-version-maven-plugin if the check-module property is
  activated.

M       jsf-api/mojarra-jsf-api.bnd

- Change OSGi Implementation-Version to be 2.2.0-m14

- Change OSGi Bundle-Version to be 2.1.99.b14

M       jsf-api/build.xml

- change mvn.deploy.release.local and mvn.deploy.release to depend on m14


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


SECTION: Modified Files
----------------------------
M       test/agnostic/resource/basic/nbactions.xml

- MAke it so this test can debug focused test.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11861 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-19314

SECTION: Modified Files
----------------------------
M       legal/jsf-cddl/LICENSE.txt
M       jsf-ri/build.xml

- Cause the LICENSE.txt to end up in META-INF/LICENSE.txt of
  javax.faces.jar.  This is the standalone impl of JSF 2.2.


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


SECTION: Modified Files
----------------------------
M       jsf-ri/conf/share/facelets_jsf_core.taglib.xml

f:attributes - MISSING WHOLE TAG
f:passThroughAttribute - MISSING WHOLE TAG
f:passThroughAttributes - MISSING WHOLE TAG
f:ajax - MISSING delay, resetValues ATTR
f:view - MISSING transient, contracts ATTR
f:selectItems - MISSING rendered, actionListener ATTR

M       jsf-ri/conf/share/html_basic.taglib.xml

h:inputFile - MISSING WHOLE TAG
h:button - MISSING role, disableClientWindow ATTR
h:commandButton - MISSING role ATTR
h:commandLink - MISSING role ATTR
h:link - MISSING role, disableClientWindow ATTR
h:doctype - MISSING WHOLE TAG


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11864 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20292

SECTION: Modified Files
----------------------------
M       jsf-ri/conf/share/facelets_jsf_core.taglib.xml
M       jsf-ri/conf/share/html_basic.taglib.xml

- Had to revert this because it was causing quicklook tests to fail.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11867 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20123


SECTION: Modified Files
----------------------------
M       jsf-ri/build-pre-maven-rename.xml
M       jsf-api/build-pre-maven-rename.xml

- Apply the changes from "svn diff -r 11859:11860" to the
  "pre-maven-rename" variant.



git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11872 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20292

- Re committing after re-running QL five different ways (literally).

SECTION: Modified Files
----------------------------
M jsf-ri/conf/share/facelets_jsf_core.taglib.xml

f:attributes - MISSING WHOLE TAG
f:passThroughAttribute - MISSING WHOLE TAG
f:passThroughAttributes - MISSING WHOLE TAG
f:ajax - MISSING delay, resetValues ATTR
f:view - MISSING transient, contracts ATTR
f:selectItems - MISSING rendered, actionListener ATTR

M jsf-ri/conf/share/html_basic.taglib.xml

h:inputFile - MISSING WHOLE TAG
h:button - MISSING role, disableClientWindow ATTR
h:commandButton - MISSING role ATTR
h:commandLink - MISSING role ATTR
h:link - MISSING role, disableClientWindow ATTR
h:doctype - MISSING WHOLE TAG



git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11873 761efcf2-d34d-6b61-9145-99dcacc3edf1
http://java.net/jira/browse/GLASSFISH-20123

SECTION: Modified Files
----------------------------
M       jsf-api/build-pre-maven-rename.xml

- Correct GAV for pre-maven-rename artifacts.


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

This commit does two things.

1. Fix 2841, providing a new testcase.

2. Fix the migration of ConfigFileTestCase over from cactus.  Apparently
   when this test was migrated in this commit

It turns out 1.) showed up 2.).  I'm glad we found it, but it's always
troubling when ignorance of an ignored test shows up.

r10263 | rogerk | 2012-07-11 15:52:05 -0400 (Wed, 11 Jul 2012) | 481 lines

<< http://java.net/jira/browse/JAVASERVERFACES-2436 >>

   it was not completely migrated.  This changebundle will list the
   changes necessary to complete the migration.

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

- Fix an invalid assumption: the *last* faces-config.xml is always
  WEB-INF/faces-config.xml.  This is not true if there is no
  WEB-INF/faces-config.xml but there *is* a META-INF/faces-config.xml in
  a jar on the classpath.

M test/agnostic/vdl/facelets/pom.xml

- Wire in new test

M       test/agnostic/config/basic/src/test/java/com/sun/faces/test/agnostic/config/basic/ConfigFileIT.java
M       test/agnostic/config/basic/src/main/java/com/sun/faces/test/agnostic/config/basic/ConfigFileBean.java
M       test/agnostic/config/embedConfig/src/test/java/com/sun/faces/test/agnostic/config/basic/ConfigFileIT.java
M       test/agnostic/config/extraConfig/src/test/java/com/sun/faces/test/agnostic/config/basic/ConfigFileIT.java

- These tests were all showing up as passing because they were really
  actually doing nothing but loading the page.  The correct thing is to
  load the page and look for the string SUCCESS.

- After this commit, I'm going to repackage and rename these tests.

A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/nbactions.xml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/only_faces_config_in_jar/Issue2841IT.java
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/src/main/java/com/sun/faces/test/agnostic/vdl/facelets/only_faces_config_in_jar/TestBean.java
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/src/main/webapp/index.xhtml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/src/main/webapp/WEB-INF/web.xml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/src/main/webapp/WEB-INF/glassfish-web.xml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/src/main/webapp/Issue2575_templates
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/app/pom.xml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/pom.xml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/jar/src/main/java/com/sun/faces/test/agnostic/vdl/facelets/only_faces_config_in_jar/Bean.java
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/jar/src/main/resources/META-INF/faces-config.xml
A       test/agnostic/vdl/facelets/only_faces_config_in_jar/jar/pom.xml

- New test case.

A       test/agnostic/config/basic/nbactions.xml
A       test/agnostic/config/embedConfig/nbactions.xml
A       test/agnostic/config/extraConfig/nbactions.xml
A       test/agnostic/config/basic/src/main/webapp/WEB-INF/glassfish-web.xml
A       test/agnostic/config/embedConfig/src/main/webapp/WEB-INF/glassfish-web.xml
A       test/agnostic/config/extraConfig/src/main/webapp/WEB-INF/glassfish-web.xml

- These files enable "Run Test" from within NetBeans.

A  +    test/agnostic/config/basic/src/main/java/com/sun/faces/test/agnostic/config/basic/TestRenderer.java
A       test/agnostic/config/basic/src/main/webapp/WEB-INF/faces-config.xml
A       test/agnostic/config/embedConfig/src/main/webapp/WEB-INF/faces-config.xml
A       test/agnostic/config/extraConfig/src/main/webapp/WEB-INF/faces-config.xml
A       test/agnostic/config/extraConfig/src/main/webapp/WEB-INF/classes/META-INF/faces-config.xml

- This is the heart of the incomplete migration.  Much of the content
  from this testcase is in the cactus faces-config.xml.  Because that
  content was entirely absent from the r10263 migration effort, the test
  could never have possibly worked.


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

SECTION: Modified Files
----------------------------
A       test/agnostic/config/embedConfig/src/test/java/com/sun/faces/test/agnostic/config/embed
A  +    test/agnostic/config/embedConfig/src/test/java/com/sun/faces/test/agnostic/config/embed/ConfigFileIT.java
A       test/agnostic/config/extraConfig/src/test/java/com/sun/faces/test/agnostic/config/extra
A  +    test/agnostic/config/extraConfig/src/test/java/com/sun/faces/test/agnostic/config/extra/ConfigFileIT.java
D       test/agnostic/config/embedConfig/src/test/java/com/sun/faces/test/agnostic/config/basic
D       test/agnostic/config/embedConfig/src/test/java/com/sun/faces/test/agnostic/config/basic/ConfigFileIT.java
D       test/agnostic/config/extraConfig/src/test/java/com/sun/faces/test/agnostic/config/basic
D       test/agnostic/config/extraConfig/src/test/java/com/sun/faces/test/agnostic/config/basic/ConfigFileIT.java

- Complete the next stage in the rehabilitation of the
  ConfigFileTestCase by making the test packages unique.


git-svn-id: https://svn.java.net/svn/mojarra~svn/branches/MOJARRA_2_2_0_GLASSFISH_4_0@11887 761efcf2-d34d-6b61-9145-99dcacc3edf1
Removing unnecessary beans.xml file, which will prevent double registration of the csfFLOWDISCOVERYCDIHELPER

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


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

- add getBasePath() method that takes into account whether or not
  contracts are in play or not.  In the common case, when they are not,
  it just returns the result of calling getBaseResourcePath().

- add "contract" parameter to findLibrary().

M       jsf-ri/src/main/java/com/sun/faces/application/resource/LibraryInfo.java
M       jsf-ri/src/main/java/com/sun/faces/application/resource/FaceletLibraryInfo.java

- Add "contract" ivar.

M       jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceHandlerImpl.java
M       jsf-ri/src/main/java/com/sun/faces/application/resource/WebappResourceHelper.java
M       jsf-ri/src/main/java/com/sun/faces/application/resource/ClasspathResourceHelper.java

- Honor the new findLibrary() signature.

M       jsf-ri/src/main/java/com/sun/faces/application/resource/ResourceManager.java

- Honor the additional requirement to consider contracts.

M       jsf-ri/test/com/sun/faces/application/resource/TestResourceImpl.java
M       test/agnostic/vdl/facelets/contracts/vhosts/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/contracts/vhosts/Issue2511IT.java
M       test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/contracts/host1/header.xhtml
M       test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/contracts/host1/lib/cc.xhtml
M       test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/header.xhtml
M       test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/template.xhtml
M       test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/resources/lib/2_3/cc.xhtml
M       test/agnostic/vdl/facelets/contracts/vhosts/src/main/webapp/resources/lib/2_3/template.xhtml

- Test changes.


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