Skip to main content

Source code revision

svn

summary: Forward port single-jar mojarra to GlassFish trunk http://java.net/jira/browse/JAVASERVERFACES-2028
revision: 51418
author: edburns
date: 2011-12-09 17:52:40 UTC (2 years)
message: Forward port single-jar mojarra to GlassFish trunk http://java.net/jira/browse/JAVASERVERFACES-2028

testng-summary:
[echo] [testng]
[echo] [testng] ===============================================
[echo] [testng] QuickLookTests
[echo] [testng] Total tests run: 107, Failures: 0, Skips: 0
[echo] [testng] ===============================================
[echo] [testng]
[INFO] Executed tasks
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESSFUL
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 6 minutes 5 seconds
[INFO] Finished at: Fri Dec 09 12:42:54 EST 2011
[INFO] Final Memory: 23M/290M
[INFO] ------------------------------------------------------------------------

Also manually ran admingui.

r=jdlee

M javadoc.xml

- depend on org.glassfish:javax.faces:2.1.6 using the ant syntax.

M appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java
M appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider


- comment only change s/jsf-ri/javax.faces

M appserver/paas/console/plugin-system/pom.xml
M appserver/paas/console/plugin-system-jsf/pom.xml
M appserver/paas/console/plugins/example/pom.xml
M appserver/paas/console/pom.xml
M appserver/paas/console/webapp/pom.xml
M appserver/javaee-api/javax.javaee/pom.xml
M appserver/packager/glassfish-jsf/pom.xml
M appserver/web/jsf-connector/pom.xml
M appserver/web/weld-integration/pom.xml
M appserver/admingui/common/pom.xml
M appserver/admingui/pom.xml

- various permutations for introducing dependencies on the new jar

M appserver/jdbc/admin/src/test/resources/DomainTest.xml
M nucleus/core/kernel/src/test/resources/DomainTest.xml
M nucleus/common/common-util/src/test/resources/v2domain.xml

- in the section, declare that javax.faces.jar has taglibs
and tag listeners.

M appserver/javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml
M appserver/javaee-api/javax.javaee/src/main/assembly/api-assembly.xml

- replace the for jsf-api,jsf-impl with one include for javax.faces.

M appserver/tests/embedded/maven-plugin/jsftest/pom.xml

- depend on the api.

M appserver/tests/embedded/web/web-war/test/pom.xml

- depend on the impl

M appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF

- On the Class-path entry, depend on javax.faces.jar instead of jsf-api.jar

M appserver/packager/pom.xml

- the all important declaration, which must
include jsf-api.jar and jsf-impl.jar because these are pulled in by
another module via transitive dependency. The name of this other module
is "fighterfish" at the time of this commit.

M appserver/packager/glassfish-jsf/src/main/resources/pkg_proto.py

- fix project url for JSF to not have ".dev"

M appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java

- modify the code that allows MyFaces to replace Mojarra so that it
knows the new jar name.

M appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java

- in getClassPath(), replace the literal string "jsf-impl.jar" with
"javax.faces.jar".

M pom.xml

- remove jsf-api.version and jsf-impl.version properties

- replace with mojarra.version property. Current value 2.1.6.

- no longer depend on jsf-api and jsf-impl, depend on javax.faces
instead.

M nucleus/packager/nucleus-base/lib/templates/default-web.xml

- remove jsf-api.jar and jsf-impl.jar

- add javax.faces.jar

M nucleus/packager/nucleus-base/bin/jspc
M nucleus/packager/nucleus-base/bin/jspc.bat

- remove JSF_API property, make JSF_IMPL property be javax.faces,
include JSF_IMPL property reference where necessary.

commit line

svn commit -F changebundle.txt javadoc.xml appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java appserver/paas/console/plugin-system/pom.xml appserver/paas/console/plugin-system-jsf/pom.xml appserver/paas/console/plugins/example/pom.xml appserver/paas/console/pom.xml appserver/paas/console/webapp/pom.xml appserver/jdbc/admin/src/test/resources/DomainTest.xml appserver/javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml appserver/javaee-api/javax.javaee/src/main/assembly/api-assembly.xml appserver/javaee-api/javax.javaee/pom.xml appserver/tests/embedded/maven-plugin/jsftest/pom.xml appserver/tests/embedded/web/web-war/test/pom.xml appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF appserver/packager/pom.xml appserver/packager/glassfish-jsf/src/main/resources/pkg_proto.py appserver/packager/glassfish-jsf/pom.xml appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider appserver/web/jsf-connector/pom.xml appserver/web/weld-integration/pom.xml appserver/admingui/common/pom.xml appserver/admingui/pom.xml appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java pom.xml nucleus/core/kernel/src/test/resources/DomainTest.xml nucleus/common/common-util/src/test/resources/v2domain.xml nucleus/packager/nucleus-base/lib/templates/default-web.xml nucleus/packager/nucleus-base/bin/jspc nucleus/packager/nucleus-base/bin/jspc.bat
Change Path Actions
M trunk/main/appserver/admingui/common/pom.xml
M trunk/main/appserver/admingui/pom.xml
M trunk/main/appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java
M trunk/main/appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF
M trunk/main/appserver/javaee-api/javax.javaee/pom.xml
M trunk/main/appserver/javaee-api/javax.javaee/src/main/assembly/api-assembly.xml
M trunk/main/appserver/javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml
M trunk/main/appserver/jdbc/admin/src/test/resources/DomainTest.xml
M trunk/main/appserver/paas/console/plugin-system-jsf/pom.xml
M trunk/main/appserver/paas/console/plugin-system/pom.xml
M trunk/main/appserver/paas/console/plugins/example/pom.xml
M trunk/main/appserver/paas/console/pom.xml
M trunk/main/appserver/paas/console/webapp/pom.xml
M trunk/main/appserver/packager/glassfish-jsf/pom.xml
M trunk/main/appserver/packager/glassfish-jsf/src/main/resources/pkg_proto.py
M trunk/main/appserver/packager/pom.xml
M trunk/main/appserver/tests/embedded/maven-plugin/jsftest/pom.xml
M trunk/main/appserver/tests/embedded/web/web-war/test/pom.xml
M trunk/main/appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java
M trunk/main/appserver/web/jsf-connector/pom.xml
M trunk/main/appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider
M trunk/main/appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java
M trunk/main/appserver/web/weld-integration/pom.xml
M trunk/main/javadoc.xml
M trunk/main/nucleus/common/common-util/src/test/resources/v2domain.xml
M trunk/main/nucleus/core/kernel/src/test/resources/DomainTest.xml
M trunk/main/nucleus/packager/nucleus-base/bin/jspc
M trunk/main/nucleus/packager/nucleus-base/bin/jspc.bat
M trunk/main/nucleus/packager/nucleus-base/lib/templates/default-web.xml
M trunk/main/pom.xml
 
 
Close
loading
Please Confirm
Close