http://java.net/jira/browse/GLASSFISH-20292 http://java.net/jira/browse/GLASSFISH-20232 http://java.net/jira/browse/GLASSFISH-20123 http://java.net/jira/browse/GLASSFISH-20122

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

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

Sending jsf-ri/conf/share/facelets_jsf_core.taglib.xml
Sending jsf-ri/conf/share/html_basic.taglib.xml
Transmitting file data ..
Committed revision 11873. 

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

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.
Sending jsf-ri/src/main/java/com/sun/faces/flow/FlowHandlerImpl.java
Transmitting file data .
Committed revision 11852. 

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


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.

Sending jsf-api/build-pre-maven-rename.xml
Sending jsf-ri/build-pre-maven-rename.xml
Transmitting file data ..
Committed revision 11872.

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
Sending common/ant/maven.xml
Sending common/ant/template/jsf-api-pom-template.xml
Sending common/ant/template/jsf-impl-pom-template.xml
Sending jsf-api/build.xml
Sending jsf-api/mojarra-jsf-api.bnd
Sending jsf-ri/build.xml
Sending jsf-ri/mojarra-jsf-impl.bnd
Transmitting file data .......
Committed revision 11860. 

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
Sending jsf-demo/sandbox/flow_and_contract/app/pom.xml
Deleting jsf-demo/sandbox/flow_and_contract/app/src/main/webapp/contracts
Sending jsf-ri/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
Sending jsf-ri/src/main/java/com/sun/faces/facelets/impl/DefaultFaceletFactory.java
Sending jsf-ri/src/main/java/com/sun/faces/renderkit/html_basic/OutcomeTargetRenderer.java
Adding test/agnostic/vdl/facelets/resource-resolver
Adding test/agnostic/vdl/facelets/resource-resolver/nbactions.xml
Adding test/agnostic/vdl/facelets/resource-resolver/pom.xml
Adding test/agnostic/vdl/facelets/resource-resolver/src
Adding test/agnostic/vdl/facelets/resource-resolver/src/main
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl/facelets
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver/TestResolver.java
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/resources
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/webapp
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/WEB-INF
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/WEB-INF/glassfish-web.xml
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/WEB-INF/web.xml
Adding test/agnostic/vdl/facelets/resource-resolver/src/main/webapp/a.xhtml
Adding test/agnostic/vdl/facelets/resource-resolver/src/test
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl/facelets
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver
Adding test/agnostic/vdl/facelets/resource-resolver/src/test/java/com/sun/faces/test/agnostic/vdl/facelets/resource_resolver/VerifyResourceResolverUsageIT.java
Transmitting file data ...........
Committed revision 11850. 

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

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


Sending jsf-ri/src/main/java/com/sun/faces/application/view/FaceletViewHandlingStrategy.java
Transmitting file data .
Committed revision 11851.


git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61425 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
fix IPS ml distros, 3rd try, hopefuly the last one

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61426 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
GLASSFISH-20206 Make multi-threading (4 threads max by default) the default for server

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61427 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
GLASSFISH-20206 Fix an exception that was possibly being thrown during shutdown that could cause other shutdown work to not happen

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61428 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
Fix for issue 16557700
Tests ran: Nucleus admin tests
Approved by Tom

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61429 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
trying to fix Windows-only failure

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61430 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
GLASSFISH-20316 findbugs - fix inconsistent synchronization of BeanManagerNamingProxy

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61432 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
Globalization: Glassfish 4.0 Open Source: 3rd batch check-in of translation messages

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61433 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5