javaserverfaces commented 13 years ago

The work is straightforward but it does invlove changing how we've been doing our jars for years. Here is a sketch of the work that must be done to complete this task. Naturally, there is more than one way to do it, and whomever does the work will ultimately do it their own way.

Make it so the build system in the Mojarra trunk does the following when invoked with a set of new top-level targets

mvn.deploy.release.local mvn.deploy.snapshot.local mvn.deploy.release mvn.deploy.snapshot

We already have these targets at the jsf-ri and jsf-api levels. We need to refactor so that they operate also from the top level.

As with the existing targets/macros, the ".local" ones do the work, but stop short of publishing the jars. The ones without the ".local" do the work and publish the jars. The "release" ones name the jars consistent with a "promoted build" and the "snapshot" ones name the jars with -SNAPSHOT. Note that Bill's document says nothing about snapshot.

These targets do the work of producing jars that match Bill's specification.

1. Produce an API jar

API jar file:javax.faces-api.jar OSGi Bundle-SymbolicName:javax.faces-api Maven group ID, artifact ID:javax.faces:javax.faces-api jar Extension-Name:javax.faces

This jar must be stripped using the build logic I committed in revision 8907 on the trunk.

This api jar is entirely different than our current jsf-api.jar. Even the name is different. Here are just a few of the differences.

New Old

javax.faces-api.jar jsf-api.jar Stripped of method bodies contains lots of method bodies Cannot be used at runtime Can be used at runtime, but only when jsf-impl.jar is present also. Can be used standalone at Same compile time

Make sure to update the jsf-api.bnd file to get the OSGi metadata right.

2. Produce an implementation jar

Implementation jar file:javax.faces.jar OSGi Bundle-SymbolicName:org.glassfish.javax.faces Maven group ID, artifact ID:org.glassfish:javax.faces jar Extension-Name:javax.faces

This jar is really a concatenation of our current notion of jsf-api.jar and jsf-impl.jar. It would be a grave error to keep our current notion and just smush them together to satisfy the requirements of this maven exercise. Rather, we need to retool our entire build system so that where we used to take actions on jsf-api.jar and jsf-impl.jar, we now take action on javax.faces.jar. In other words, after this maven exercise is done, we will no longer have jsf-api.jar and jsf-impl.jar anywhere in our build or in the artifacts it produces.

Here are some of the differences between the old and new way.

New Old

javax.faces.jar jsf-api.jar + jsf-impl.jar One self contained jar Two utterly dependent jars that really should have been one jar a long time ago. Suitable for deployment to Same, but need both jars. GlassFish modules dir

Fix all the hudson jobs from the breakage that may result from these changes.
Blog about the changes so our community knows about it. A lot of people know our build system well, so a drastic change like this must be advertised.

I estimate it would take a crackerjack engineer about week to do this start to finish.

Ed

javaserverfaces commented 13 years ago

Reported by @edburns

javaserverfaces commented 13 years ago

@edburns said: Bulk assign all impl issues to Roger.

javaserverfaces commented 13 years ago

@edburns said: Posted blocking problem to dev@glassfish: <http://java.net/projects/glassfish/lists/dev/archive/2011-07/message/115>.

javaserverfaces commented 13 years ago

@edburns said: snapshot

javaserverfaces commented 13 years ago

@edburns said: snapshot

javaserverfaces commented 13 years ago

@edburns said: You need to make this change as well to your glassfish:

Index: nucleus/packager/nucleus-base/lib/templates/default-web.xml

— nucleus/packager/nucleus-base/lib/templates/default-web.xml (revision 48311) +++ nucleus/packager/nucleus-base/lib/templates/default-web.xml (working copy) @@ -319,9 +319,8 @@ javax.servlet.jsp.jar javax.servlet.jsp.jstl.jar javax.jms.jar

jsf-api.jar
- javax.faces.jar jsp-impl.jar
jsf-impl.jar jspcaching-connector.jar web-glue.jar bean-validator.jar

javaserverfaces commented 13 years ago

@edburns said: Snapshot.

javaserverfaces commented 13 years ago

@edburns said: This works for GlassFish trunk and GlassFish 3.1.1 in both cluster and non-cluster configurations.

javaserverfaces commented 13 years ago

@edburns said: Committed part 1 of 2 to trunk. When Hudson clears, I'll commit part 1 of 2 to the MOJARRA_2_1X_ROLLING branch.

Sending build.xml Sending common/ant/common.xml Sending common/ant/glassfish/container.xml Sending common/ant/glassfishV3/container.xml Sending common/ant/glassfishV3.1/container.xml Adding common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch Adding common/ant/glassfishV3.1/lib_templates_default-web_xml.patch Sending common/ant/glassfishV3.1_no_cluster/container.xml Adding common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch Adding common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch Sending common/ant/glassfishV3prelude/container.xml Sending common/ant/maven.xml Sending common/ant/source-build-setup.xml Sending common/ant/template/container.xml Sending common/ant/template/jsf-api-pom-template.xml Sending common/ant/template/jsf-impl-pom-template.xml Sending common/ant/test-app.xml Sending common/ant/tomcat6/container.xml Sending common/ant/tomcat7/container.xml Sending common/ant/wls_10_3_4_no_cluster/container.xml Sending contrib/sandbox/build.xml Sending docs/releasenotes.html Sending injectionprovider/build.xml Sending jsf-api/build-source.xml Sending jsf-api/build.xml Sending jsf-api/interim-pom.xml Sending jsf-api/mojarra-jsf-api.bnd Sending jsf-demo/ajax-component/build.xml Sending jsf-demo/archive/carstore/build.xml Sending jsf-demo/archive/components/build.xml Sending jsf-demo/archive/guessNumber/build.xml Sending jsf-demo/archive/helloDuke/build.xml Sending jsf-demo/archive/j2meDemo/build.properties.sample Sending jsf-demo/archive/j2meDemo/build.xml Sending jsf-demo/archive/mojarra_ext/build.xml Sending jsf-demo/archive/nonjsp/build.xml Sending jsf-demo/archive/renderkits/build.xml Sending jsf-demo/archive/standard/build.xml Sending jsf-demo/archive/webtier-sample/build.xml Sending jsf-demo/basic-ajax/build.xml Sending jsf-demo/basic-ezcomp/build.xml Sending jsf-demo/bean-validator/build.xml Sending jsf-demo/build-tests.xml Sending jsf-demo/build.xml Sending jsf-demo/custom-bean-scope/build.xml Sending jsf-demo/custom-tag/build.xml Sending jsf-demo/guessNumber/build.xml Sending jsf-demo/helloworld/build.xml Sending jsf-demo/ifnavigation/build.xml Sending jsf-demo/sandbox/OpenAjaxBridge/build.xml Sending jsf-demo/sandbox/ajax-queue/build.xml Sending jsf-demo/sandbox/ajax-request/build.xml Sending jsf-demo/sandbox/ajax-tag/build.xml Sending jsf-demo/sandbox/demo-standalone/build.xml Sending jsf-demo/sandbox/ezcomp00/build.xml Sending jsf-demo/sandbox/ezcomp02/build.xml Sending jsf-demo/sandbox/ezcomp03/build.xml Sending jsf-demo/sandbox/permalink/build.xml Sending jsf-demo/sandbox/tree-visit/build.xml Sending jsf-demo/test/mappingDemo/build.xml Sending jsf-demo/viewExpired/build.xml Sending jsf-ri/build-source.xml Sending jsf-ri/build-tests.xml Sending jsf-ri/build.xml Sending jsf-ri/maven.xml Sending jsf-ri/mojarra-jsf-impl.bnd Sending jsf-ri/systest/build.xml Sending jsf-ri/systest-per-webapp/build.xml Sending updatecenter2/build.xml Transmitting file data ..................................................................... Committed revision 9222.

javaserverfaces commented 13 years ago

@edburns said: Committed to 2.1 branch.

Sending build.xml Sending common/ant/common.xml Sending common/ant/glassfish/container.xml Sending common/ant/glassfishV3/container.xml Sending common/ant/glassfishV3.1/container.xml Adding common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch Adding common/ant/glassfishV3.1/lib_templates_default-web_xml.patch Sending common/ant/glassfishV3.1_no_cluster/container.xml Adding common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch Adding common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch Sending common/ant/glassfishV3prelude/container.xml Sending common/ant/maven.xml Sending common/ant/source-build-setup.xml Sending common/ant/template/container.xml Sending common/ant/template/jsf-api-pom-template.xml Sending common/ant/template/jsf-impl-pom-template.xml Sending common/ant/test-app.xml Sending common/ant/tomcat6/container.xml Sending common/ant/tomcat7/container.xml Sending common/ant/wls-10.3.4_no_cluster/container.xml Sending contrib/sandbox/build.xml Sending docs/releasenotes.html Sending injectionprovider/build.xml Sending jsf-api/build-source.xml Sending jsf-api/build.xml Sending jsf-api/interim-pom.xml Sending jsf-api/mojarra-jsf-api.bnd Sending jsf-demo/ajax-component/build.xml Sending jsf-demo/archive/carstore/build.xml Sending jsf-demo/archive/components/build.xml Sending jsf-demo/archive/guessNumber/build.xml Sending jsf-demo/archive/helloDuke/build.xml Sending jsf-demo/archive/j2meDemo/build.properties.sample Sending jsf-demo/archive/j2meDemo/build.xml Sending jsf-demo/archive/mojarra_ext/build.xml Sending jsf-demo/archive/nonjsp/build.xml Sending jsf-demo/archive/renderkits/build.xml Sending jsf-demo/archive/standard/build.xml Sending jsf-demo/archive/webtier-sample/build.xml Sending jsf-demo/basic-ajax/build.xml Sending jsf-demo/bean-validator/build.xml Sending jsf-demo/build-tests.xml Sending jsf-demo/build.xml Sending jsf-demo/custom-bean-scope/build.xml Sending jsf-demo/custom-tag/build.xml Sending jsf-demo/guessNumber/build.xml Sending jsf-demo/helloworld/build.xml Sending jsf-demo/ifnavigation/build.xml Sending jsf-demo/sandbox/OpenAjaxBridge/build.xml Sending jsf-demo/sandbox/ajax-queue/build.xml Sending jsf-demo/sandbox/ajax-request/build.xml Sending jsf-demo/sandbox/ajax-tag/build.xml Sending jsf-demo/sandbox/demo-standalone/build.xml Sending jsf-demo/sandbox/ezcomp00/build.xml Sending jsf-demo/sandbox/ezcomp02/build.xml Sending jsf-demo/sandbox/ezcomp03/build.xml Sending jsf-demo/sandbox/permalink/build.xml Sending jsf-demo/sandbox/tree-visit/build.xml Sending jsf-demo/test/mappingDemo/build.xml Sending jsf-demo/viewExpired/build.xml Sending jsf-ri/build-source.xml Sending jsf-ri/build-tests.xml Sending jsf-ri/build.xml Sending jsf-ri/maven.xml Sending jsf-ri/mojarra-jsf-impl.bnd Sending jsf-ri/systest/build.xml Sending jsf-ri/systest-per-webapp/build.xml Sending updatecenter2/build.xml Transmitting file data ................................................................ Committed revision 9223.

Next step will be to attempt Part 2 on trunk.

javaserverfaces commented 13 years ago

@edburns said: In progress. Have the javadoc almost working using the existing build logic.

javaserverfaces commented 13 years ago

@edburns said: For the record, the rules this issue is trying to apply to mojarra are defined at <http://wikis.sun.com/display/GlassFish/Maven+Versioning+Rules>.

javaserverfaces commented 13 years ago

@edburns said: Snapshot, ready for commit to trunk.

javaserverfaces commented 13 years ago

@edburns said: Committed to trunk.

Sending build.xml 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-demo/build.xml Transmitting file data ...... Committed revision 9231.

I'll commit this to branch once the hudson of record, ron-vm8, clears out. It's having some trouble now due to an issue unrelated to this one.

javaserverfaces commented 13 years ago

@edburns said: Committed to 2.1 branch.

Sending build.xml 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-demo/build.xml Transmitting file data ...... Committed revision 9234.

When hudson clears, I'll publish the official JSF 2.1 jar to the java.net maven repo, as well as the 2.1.3-SNAPSHOT implementation jar.

Ed

javaserverfaces commented 13 years ago

@edburns said: Committed to trunk some changes to make the regression tests depend on the just-built api jar.

Sending common/ant/maven.xml Sending jsf-test/GLASSFISH-16847/jsftest/pom.xml Sending jsf-test/#1641/i_jsf_1637/pom.xml Sending jsf-test/#1947/i_jsf_1943/pom.xml Sending jsf-test/#1999/i_jsf_1995_war_1/pom.xml Sending jsf-test/#1999/i_jsf_1995_war_2/pom.xml Sending jsf-test/#2029/i_jsf_2025/pom.xml Sending jsf-test/#2037/i_jsf_2033_war/pom.xml Sending jsf-test/#2042/i_jsf_2038/pom.xml Sending jsf-test/#2056/i_jsf_2052/pom.xml Sending jsf-test/#2069 is not implemented")/i_jsf_2065/pom.xml Sending jsf-test/#2071/i_jsf_2067/pom.xml Sending jsf-test/#2078/i_jsf_2074/pom.xml Sending jsf-test/#2083/i_jsf_2079_war_0_ProjectStageDevelopment/pom.xml Sending jsf-test/#2083/i_jsf_2079_war_1_ProjectStageProduction/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-745/i_spec_745_war/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-758/i_spec_758_war/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-762/i_spec_762_war/pom.xml Sending jsf-test/[JAVASERVERFACES_SPEC_PUBLIC-901](https://java.net/jira/browse/JAVASERVERFACES_SPEC_PUBLIC-901 "Deprecate "targets" concept")/i_spec_901_war/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-915/i_spec_915_war/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-997/i_spec_997_war/pom.xml Sending jsf-test/admingui/admingui_test_war/pom.xml Sending jsf-test/build.xml Transmitting file data ....................... Committed revision 9235.

javaserverfaces commented 13 years ago

@edburns said:

Followup change. Unfortunately, I missed passing the $ {spec.snapshot.dir}

property to the invocation of mvn in the jsf.mvn macro.

Sending common/ant/maven.xml Transmitting file data . Committed revision 9237.

javaserverfaces commented 13 years ago

@edburns said: Commit to 2.1 branch.

Sending common/ant/maven.xml Sending jsf-test/GLASSFISH-16847/jsftest/pom.xml Sending jsf-test/#1947/i_jsf_1943/pom.xml Sending jsf-test/#1999/i_jsf_1995_war_1/pom.xml Sending jsf-test/#1999/i_jsf_1995_war_2/pom.xml Sending jsf-test/#2069 is not implemented")/i_jsf_2065/pom.xml Sending jsf-test/#2071/i_jsf_2067/pom.xml Sending jsf-test/#2078/i_jsf_2074/pom.xml Sending jsf-test/#2083/i_jsf_2079_war_0_ProjectStageDevelopment/pom.xml Sending jsf-test/#2083/i_jsf_2079_war_1_ProjectStageProduction/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-915/i_spec_915_war/pom.xml Sending jsf-test/admingui/admingui_test_war/pom.xml Sending jsf-test/build.xml Transmitting file data ............. Committed revision 9238.

javaserverfaces commented 13 years ago

@edburns said: Once hudson is all clear, I'll publish the 2.1 artifacts using the new format.

javaserverfaces commented 13 years ago

@edburns said: Faces API published to http://download.java.net/maven/2/javax/faces/javax.faces-api/2.1/

This commit fixed a bug that prevented the publish from working right. Sending jsf-api/build.xml Transmitting file data . Committed revision 9239.

I'll now merge that commit from the branch to the trunk.

javaserverfaces commented 13 years ago

@edburns said: Merge r9239 from 2.1 branch to trunk.

svn log -r 9240

r9240 | edburns | 2011-07-29 12:10:48 -0400 (Fri, 29 Jul 2011) | 8 lines

Cleanup. Found bug when deploying http://java.net/jira/browse/JAVASERVERFACES-2028

SECTION: Modified Files

M jsf-api/build.xml

Pass version attribute to non ".local" maven deployment targets.

javaserverfaces commented 13 years ago

@edburns said: Committed this to the mojarra 2.1.2 tag

Sending build.xml Sending common/ant/common.xml Sending common/ant/glassfish/container.xml Sending common/ant/glassfishV3/container.xml Sending common/ant/glassfishV3.1/container.xml Adding common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch Adding common/ant/glassfishV3.1/lib_templates_default-web_xml.patch Sending common/ant/glassfishV3.1_no_cluster/container.xml Adding common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch Adding common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch Sending common/ant/glassfishV3prelude/container.xml Sending common/ant/maven.xml Sending common/ant/source-build-setup.xml Sending common/ant/template/container.xml Sending common/ant/template/jsf-api-pom-template.xml Sending common/ant/template/jsf-impl-pom-template.xml Sending common/ant/test-app.xml Sending common/ant/tomcat6/container.xml Sending common/ant/tomcat7/container.xml Sending contrib/sandbox/build.xml Sending injectionprovider/build.xml Sending jsf-api/build-source.xml Sending jsf-api/build.xml Sending jsf-api/interim-pom.xml Sending jsf-api/mojarra-jsf-api.bnd Sending jsf-demo/ajax-component/build.xml Sending jsf-demo/archive/carstore/build.xml Sending jsf-demo/archive/components/build.xml Sending jsf-demo/archive/guessNumber/build.xml Sending jsf-demo/archive/helloDuke/build.xml Sending jsf-demo/archive/j2meDemo/build.properties.sample Sending jsf-demo/archive/j2meDemo/build.xml Sending jsf-demo/archive/mojarra_ext/build.xml Sending jsf-demo/archive/nonjsp/build.xml Sending jsf-demo/archive/renderkits/build.xml Sending jsf-demo/archive/standard/build.xml Sending jsf-demo/archive/webtier-sample/build.xml Sending jsf-demo/basic-ajax/build.xml Sending jsf-demo/bean-validator/build.xml Sending jsf-demo/build-tests.xml Sending jsf-demo/build.xml Sending jsf-demo/custom-bean-scope/build.xml Sending jsf-demo/custom-tag/build.xml Sending jsf-demo/guessNumber/build.xml Sending jsf-demo/helloworld/build.xml Sending jsf-demo/ifnavigation/build.xml Sending jsf-demo/sandbox/OpenAjaxBridge/build.xml Sending jsf-demo/sandbox/ajax-queue/build.xml Sending jsf-demo/sandbox/ajax-request/build.xml Sending jsf-demo/sandbox/ajax-tag/build.xml Sending jsf-demo/sandbox/demo-standalone/build.xml Sending jsf-demo/sandbox/ezcomp00/build.xml Sending jsf-demo/sandbox/ezcomp02/build.xml Sending jsf-demo/sandbox/ezcomp03/build.xml Sending jsf-demo/sandbox/permalink/build.xml Sending jsf-demo/sandbox/tree-visit/build.xml Sending jsf-demo/test/mappingDemo/build.xml Sending jsf-demo/viewExpired/build.xml Sending jsf-ri/build-source.xml Sending jsf-ri/build-tests.xml Sending jsf-ri/build.xml Sending jsf-ri/maven.xml Sending jsf-ri/mojarra-jsf-impl.bnd Sending jsf-ri/systest/build.xml Sending jsf-ri/systest-per-webapp/build.xml Sending jsf-test/#1947/i_jsf_1943/pom.xml Sending jsf-test/#1999/i_jsf_1995_war_1/pom.xml Sending jsf-test/#1999/i_jsf_1995_war_2/pom.xml Sending jsf-test/#2069 is not implemented")/i_jsf_2065/pom.xml Sending jsf-test/#2071/i_jsf_2067/pom.xml Sending jsf-test/#2078/i_jsf_2074/pom.xml Sending jsf-test/#2083/i_jsf_2079_war_0_ProjectStageDevelopment/pom.xml Sending jsf-test/#2083/i_jsf_2079_war_1_ProjectStageProduction/pom.xml Sending jsf-test/JAVASERVERFACES_SPEC_PUBLIC-915/i_spec_915_war/pom.xml Sending jsf-test/build.xml Sending updatecenter2/build.xml Transmitting file data ........................................................................ Committed revision 9243.

Commit log message:

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

This change-bundle applies to the 2.1.2 tag the sum total of changes necessary to make the Mojarra build implement the Maven and OSGi naming conventions specified at <http://wikis.sun.com/display/GlassFish/Maven+Versioning+Rules>.

I am taking the unorthodox step of committing to a tag because these changes do not change the behavior of the code itself, only how it is built and packaged.

I ran the complete automated test suite against GlassFish 3.1.1 final, in non-clustered mode, and found that 2127 tests passed successfully.

SECTION: Modified Files

M common/ant/glassfish/container.xml M common/ant/common.xml M common/ant/glassfishV3.1_no_cluster/container.xml M common/ant/source-build-setup.xml M common/ant/glassfishV3.1/container.xml M common/ant/glassfishV3/container.xml M common/ant/test-app.xml M common/ant/maven.xml M common/ant/template/container.xml M common/ant/template/jsf-impl-pom-template.xml M common/ant/template/jsf-api-pom-template.xml M common/ant/glassfishV3prelude/container.xml M common/ant/tomcat6/container.xml M common/ant/tomcat7/container.xml M jsf-api/interim-pom.xml M jsf-api/mojarra-jsf-api.bnd M jsf-api/build-source.xml M jsf-api/build.xml M jsf-ri/build-source.xml M jsf-ri/build.xml M jsf-ri/build-tests.xml M jsf-ri/maven.xml M jsf-ri/mojarra-jsf-impl.bnd M jsf-ri/systest-per-webapp/build.xml M jsf-ri/systest/build.xml M injectionprovider/build.xml M build.xml M jsf-test/#1999/i_jsf_1995_war_1/pom.xml M jsf-test/#1999/i_jsf_1995_war_2/pom.xml M jsf-test/#2069 is not implemented")/i_jsf_2065/pom.xml M jsf-test/#2078/i_jsf_2074/pom.xml M jsf-test/#2071/i_jsf_2067/pom.xml M jsf-test/#1947/i_jsf_1943/pom.xml M jsf-test/#2083/i_jsf_2079_war_0_ProjectStageDevelopment/pom.xml M jsf-test/#2083/i_jsf_2079_war_1_ProjectStageProduction/pom.xml M jsf-test/JAVASERVERFACES_SPEC_PUBLIC-915/i_spec_915_war/pom.xml M jsf-test/build.xml M contrib/sandbox/build.xml M jsf-demo/test/mappingDemo/build.xml M jsf-demo/archive/guessNumber/build.xml M jsf-demo/archive/standard/build.xml M jsf-demo/archive/webtier-sample/build.xml M jsf-demo/archive/carstore/build.xml M jsf-demo/archive/j2meDemo/build.properties.sample M jsf-demo/archive/j2meDemo/build.xml M jsf-demo/archive/components/build.xml M jsf-demo/archive/nonjsp/build.xml M jsf-demo/archive/renderkits/build.xml M jsf-demo/archive/mojarra_ext/build.xml M jsf-demo/archive/helloDuke/build.xml M jsf-demo/ajax-component/build.xml M jsf-demo/custom-tag/build.xml M jsf-demo/custom-bean-scope/build.xml M jsf-demo/bean-validator/build.xml M jsf-demo/viewExpired/build.xml M jsf-demo/sandbox/OpenAjaxBridge/build.xml M jsf-demo/sandbox/permalink/build.xml M jsf-demo/sandbox/tree-visit/build.xml M jsf-demo/sandbox/ajax-tag/build.xml M jsf-demo/sandbox/ezcomp00/build.xml M jsf-demo/sandbox/ezcomp02/build.xml M jsf-demo/sandbox/ezcomp03/build.xml M jsf-demo/sandbox/ajax-queue/build.xml M jsf-demo/sandbox/ajax-request/build.xml M jsf-demo/sandbox/demo-standalone/build.xml M jsf-demo/build-tests.xml M jsf-demo/build.xml M jsf-demo/guessNumber/build.xml M jsf-demo/basic-ajax/build.xml M jsf-demo/helloworld/build.xml M jsf-demo/ifnavigation/build.xml M updatecenter2/build.xml

A + common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch A + common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch A + common/ant/glassfishV3.1/lib_templates_default-web_xml.patch A + common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch

javaserverfaces commented 13 years ago

@edburns said: The impl jar that goes along with <http://download.java.net/maven/2/javax/faces/javax.faces-api/2.1/> has now been published at <http://download.java.net/maven/2/org/glassfish/javax.faces/2.1.2/>.

Aside from the need to push these same jars to the repo as described in <http://java.net/projects/maven2-repository/pages/MigrationAndCleanupRelatedDocumentation>, the task of making Mojarra conform to <http://wikis.sun.com/display/GlassFish/Maven+Versioning+Rules> is complete.

Phew.

javaserverfaces commented 13 years ago

@edburns said: The corresponding maven repo JIRA is <http://java.net/jira/browse/MAVEN2_REPOSITORY-70>.

javaserverfaces commented 13 years ago

@edburns said: Successfully published javax.faces-api 2.2-SNAPSHOT artifact using these changes.

javaserverfaces commented 13 years ago

@edburns said: 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-ri/build.xml Transmitting file data ..... Committed revision 9250.

Committed to trunk.

Can publish to snapshot repo http://java.net/jira/browse/JAVASERVERFACES-2028

SECTION: Modified Files

M common/ant/maven.xml

Delete the build/mvn directories before the build, not after. That way, you can inspect the generated artifacts.
Include properties to honor proxy settings.

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

Fix license url and scm urls
put mvn-gpg-plugin in the profile section

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

put mvn-gpg-plugin in the profile section

M jsf-api/build.xml M jsf-ri/build.xml

comments that illustrate the necessary properties for passphrase and release profile activation

javaserverfaces commented 13 years ago

@edburns said: Committed to 2.1 branch:

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-ri/build.xml Transmitting file data ..... Committed revision 9251.

javaserverfaces commented 13 years ago

@edburns said: 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-ri/build.xml Transmitting file data ..... Committed revision 9253.

Committed to 2.1.2 tag.

javaserverfaces commented 13 years ago

@edburns said: Sending common/ant/template/jsf-api-pom-template.xml Sending common/ant/template/jsf-impl-pom-template.xml Transmitting file data .. Committed revision 9255.

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

SECTION: Modified Files

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

No need to comment out one or the other of the snashot or staging repos.

Committed to trunk.

javaserverfaces commented 13 years ago

@edburns said: Sending common/ant/template/jsf-api-pom-template.xml Sending common/ant/template/jsf-impl-pom-template.xml Transmitting file data .. Committed revision 9256.

Committed to 2.1 branch.

javaserverfaces commented 13 years ago

@edburns said: Committed to trunk.

bash-2.05b$ svncom Adding common/ant/maven-pre-maven-rename.xml Adding common/ant/template/jsf-pre-maven-rename-api-pom-template.xml Adding common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml Adding jsf-api/build-pre-maven-rename.xml Adding jsf-ri/build-pre-maven-rename.xml Adding jsf-tools/conf/FaceletsHtmlBasicTaglib21.pre-maven-rename.properties Adding jsf-tools/conf/HtmlBasicTaglib21.pre-maven-rename.properties Transmitting file data ....... Committed revision 9257. bash-2.05b$ cat changebundle.txt http://java.net/jira/browse/JAVASERVERFACES-2028

SECTION: Modified Files

A jsf-tools/conf/HtmlBasicTaglib21.pre-maven-rename.properties A jsf-tools/conf/FaceletsHtmlBasicTaglib21.pre-maven-rename.properties A common/ant/maven-pre-maven-rename.xml A common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml A common/ant/template/jsf-pre-maven-rename-api-pom-template.xml A jsf-api/build-pre-maven-rename.xml A jsf-ri/build-pre-maven-rename.xml

Using svn forensics, create a set of files that can be svn removed when we no longer need to produce jars using groupId: com.sun.faces artifactId: {jsf-api,jsf-impl}

.

In the meantime, these pre-maven-rename files allow you to produce the jars using the non-standard maven groupId and artifactId.

Usage:

In either jsf-api or jsf-ri, do

ant -f build-pre-maven-rename.xml mvn.pre-maven-rename.deploy.

{release,snapshot}.local

or

ant -f build-pre-maven-rename.xml mvn.pre-maven-rename.deploy.{release,snapshot}

javaserverfaces commented 13 years ago

@edburns said: Adding common/ant/maven-pre-maven-rename.xml Adding common/ant/template/jsf-pre-maven-rename-api-pom-template.xml Adding common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml Adding jsf-api/build-pre-maven-rename.xml Adding jsf-ri/build-pre-maven-rename.xml Adding jsf-tools/conf/FaceletsHtmlBasicTaglib21.pre-maven-rename.properties Adding jsf-tools/conf/HtmlBasicTaglib21.pre-maven-rename.properties

Committed revision 9258.

Committed to 2.1 branch.

javaserverfaces commented 13 years ago

@edburns said: Fix committed.

javaserverfaces commented 13 years ago

@edburns said: I hate to have to do this, but the javadoc and sources jars are not correctly being deployed.

The sources jar should contain all sources, generated and hand coded. It should not contain any documentation.

The javadoc jar should contain all generated documentation, not just javadocs, and also with the images and stylesheets to make it all look nice.

javaserverfaces commented 13 years ago

@edburns said: Metadata is correct.

Committed to trunk:

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-demo/build.xml Sending jsf-ri/build.xml Transmitting file data ...... Committed revision 9261.

Committed to 2.1 branch.

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-demo/build.xml Sending jsf-ri/build.xml Transmitting file data ...... Committed revision 9262.

Committed to 2.1 branch

Sending common/ant/maven-pre-maven-rename.xml Sending common/ant/template/jsf-pre-maven-rename-api-pom-template.xml Sending common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml Sending jsf-api/build-pre-maven-rename.xml Sending jsf-ri/build-pre-maven-rename.xml Transmitting file data ..... Committed revision 9263.

Committed to trunk.

Sending common/ant/maven-pre-maven-rename.xml Sending common/ant/template/jsf-pre-maven-rename-api-pom-template.xml Sending common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml Sending jsf-api/build-pre-maven-rename.xml Sending jsf-ri/build-pre-maven-rename.xml Transmitting file data ..... Committed revision 9264.

javaserverfaces commented 13 years ago

@edburns said: Committed to trunk:

Sending common/ant/maven-pre-maven-rename.xml Sending common/ant/maven.xml Transmitting file data .. Committed revision 9344.

Committed to 2.1 branch:

Sending common/ant/maven-pre-maven-rename.xml Sending common/ant/maven.xml Transmitting file data .. Committed revision 9345.

javaserverfaces commented 13 years ago

@edburns said: TL> Hi Ed, TL> Sorry to bother you again, I find the jsf-impl still contains the api TL> classes, and the jsf-impl-sources contains the extra api sources. Would TL> you please check whether they're correct packaged?

Thank you for reporting this. There are indeed some problems with the jars.

there is no 2.1.3 jsf-api.jar CONFIRMED
the 2.1.3 jsf-api-sources.jar does not contain sources, but docs CONFIRMED
jsf-impl.jar still contains api classes. CONFIRMED

javaserverfaces commented 13 years ago

@edburns said: Committed to trunk.

Sending common/ant/maven-pre-maven-rename.xml Sending common/ant/maven.xml Sending jsf-ri/build-pre-maven-rename.xml Transmitting file data ... Committed revision 9395.

javaserverfaces commented 13 years ago

@edburns said: Committed to 2.1 branch:

svncom Sending common/ant/common.xml Sending common/ant/maven-pre-maven-rename.xml Sending common/ant/maven.xml Sending jsf-ri/build-pre-maven-rename.xml Sending jsf-tools/pom.xml Transmitting file data ..... Committed revision 9396. bash-2.05b$

javaserverfaces commented 12 years ago

@edburns said: With the filing of #2251, and the subsequent need to publish another release from the MOJARRA_2_0X_ROLLING branch, we have to take the hit and do the maven rename there as well.

javaserverfaces commented 12 years ago

@edburns said: Make MOJARRA_2_0X_ROLLING branch conform to maven standards, but continue to use the legacy packaging for the container.deploy targets.

javaserverfaces commented 12 years ago

@edburns said: Committed to 2.0 Branch

Rhombus2:mojarra-MOJARRA_2_0X_ROLLING ejburns$ svncom Sending common/ant/common.xml Sending common/ant/glassfishV3/container.xml Adding common/ant/maven-pre-maven-rename.xml Sending common/ant/maven.xml Sending common/ant/source-build-setup.xml Sending common/ant/template/jsf-api-pom-template.xml Sending common/ant/template/jsf-impl-pom-template.xml Adding common/ant/template/jsf-pre-maven-rename-api-pom-template.xml Adding common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml Adding jsf-api/build-pre-maven-rename.xml Sending jsf-api/build.xml Sending jsf-demo/build.xml Adding jsf-ri/build-pre-maven-rename.xml Sending jsf-ri/build-tests.xml Sending jsf-ri/build.xml Sending jsf-ri/systest/build.xml Sending jsf-ri/systest-per-webapp/build.xml Adding jsf-tools/conf/FaceletsHtmlBasicTaglib21.pre-maven-rename.properties Adding jsf-tools/conf/HtmlBasicTaglib21.pre-maven-rename.properties Adding jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java Transmitting file data .................... Committed revision 9474.

javaserverfaces commented 12 years ago

@edburns said: http://java.net/jira/browse/JAVASERVERFACES-2028 Maven renaming for 2.0 branch

SECTION: Modified Files

M common/ant/maven.xml M common/ant/common.xml M common/ant/source-build-setup.xml M common/ant/template/jsf-impl-pom-template.xml M common/ant/template/jsf-api-pom-template.xml M common/ant/glassfishV3/container.xml M jsf-api/build.xml M jsf-ri/build.xml M jsf-ri/build-tests.xml M jsf-ri/systest-per-webapp/build.xml M jsf-ri/systest/build.xml M jsf-demo/build.xml

A jsf-tools/conf/HtmlBasicTaglib21.pre-maven-rename.properties A jsf-tools/conf/FaceletsHtmlBasicTaglib21.pre-maven-rename.properties A jsf-tools/src/main/java/com/sun/faces/tools/StripClassesForApiJar.java A common/ant/maven-pre-maven-rename.xml A common/ant/template/jsf-pre-maven-rename-impl-pom-template.xml A common/ant/template/jsf-pre-maven-rename-api-pom-template.xml A jsf-api/build-pre-maven-rename.xml A jsf-ri/build-pre-maven-rename.xml

I hope this issue stays closed! The only thing that could possibly cause it to reopen is a need to publish the JSF 1.2 jars using the new Maven and OSGi packaging and naming scheme. No such need has been articulated.

javaserverfaces commented 12 years ago

@edburns said: Time to put this into GlassFish trunk.

javaserverfaces commented 12 years ago

@edburns said: Here is the changebundle that put this into GlassFish 3.1.2 branch.

r49388 | edburns | 2011-09-09 14:48:45 -0400 (Fri, 09 Sep 2011) | 91 lines

Subject: pom.xml and default-web.xml review request: integrate JSF 2.1.3

This change-bundle integrates JSF 2.1.3. I have run the quicklook tests with these jars pulled fresh from maven to a local repo and the tests ran successfully to completion.

I have also brought up the adminGUI web application (as this exercises on the new JSF version). It worked just fine.

Note that this changebundle is the first to use the single jar package for Mojarra.

SECTION: Modified Files

M deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java

Replace jsf-ri with javax.faces.jar in comments

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

replace jsf-impl.jar with javax.faces.jar in

M pom.xml

Remove jsf-api.version and jsf-impl.version properties. Replace with mojarra.version property

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

com.sun.faces:jsf-api
com.sun.faces:jsf-impl
- org.glassfish:javax.faces

M javaee-api/javax.javaee/pom.xml M tests/embedded/maven-plugin/jsftest/pom.xml M tests/embedded/web/web-war/test/pom.xml M packager/glassfish-jsf/pom.xml M web/jsf-connector/pom.xml M web/weld-integration/pom.xml M admingui/common/pom.xml M admingui/pom.xml

replace jsf-api and jsf-impl dependencies with a single javax.faces dependency.

M javadoc.xml

replace jsf-api dependency with javax.faces-api

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

Modify Class-Path to replace jsf-api.jar with javax.faces.jar.

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

replace jsf-api.jar and jsf-impl.jar with javax.faces.jar

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

remove JSF_API variable
make JSF_IMPL variable's value be javax.faces.jar

M packager/pom.xml

Snjezana Sevo-Zenzerovic's ever so helpful tip got me past this troublesome maven transitive dependency blockage regarding fighterfish.

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

Change URL, replace dev.java.net with java.net

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

remove reference to jsf-impl.jar and jsf-api.jar
add reference to javax.faces.jar

M web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider

In comment, change reference to jsf-impl.jar to be a reference to javax.faces.jar

r=Snjezana, Shing-wai

Files in this commit to 3.1.2 branch:

Index: deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java Index: core/kernel/src/test/resources/DomainTest.xml Index: pom.xml Index: jdbc/admin/src/test/resources/DomainTest.xml Index: javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml Index: javaee-api/javax.javaee/src/main/assembly/api-assembly.xml Index: javaee-api/javax.javaee/pom.xml Index: tests/embedded/maven-plugin/jsftest/pom.xml Index: tests/embedded/web/web-war/test/pom.xml Index: extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF Index: javadoc.xml Index: web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java Index: web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider Index: web/jsf-connector/pom.xml Index: web/weld-integration/pom.xml Index: packager/nucleus-base/lib/templates/default-web.xml Index: packager/nucleus-base/bin/jspc Index: packager/nucleus-base/bin/jspc.bat Index: packager/pom.xml Index: packager/glassfish-jsf/src/main/resources/pkg_proto.py Index: packager/glassfish-jsf/pom.xml Index: common/common-util/src/test/resources/v2domain.xml Index: admingui/common/pom.xml Index: admingui/pom.xml

It is very likely these same files will need to be modified in the trunk.

javaserverfaces commented 12 years ago

@edburns said: Here is the same set of files, but in their new trunk locations:

appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java nucleus/core/kernel/src/test/resources/DomainTest.xml pom.xml javadoc.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/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 nucleus/packager/nucleus-base/lib/templates/default-web.xml appserver/packager/glassfish-nucleus/target/stage/glassfish3/glassfish/bin/jspc appserver/packager/glassfish-nucleus/target/stage/glassfish3/glassfish/bin/jspc.bat appserver/packager/pom.xml appserver/packager/glassfish-jsf/src/main/resources/pkg_proto.py appserver/packager/glassfish-jsf/pom.xml nucleus/common/common-util/src/test/resources/v2domain.xml appserver/admingui/common/pom.xml appserver/admingui/pom.xml

javaserverfaces commented 12 years ago

@edburns said: Make GlassFish trunk use javax.faces.jar instead of jsf-api.jar and jsf-impl.jar.

javaserverfaces commented 12 years ago

@edburns said: Latest diff.

javaserverfaces commented 12 years ago

@edburns said: Committed to GlassFish trunk.

Sending appserver/admingui/common/pom.xml Sending appserver/admingui/pom.xml Sending appserver/deployment/dol/src/test/java/com/sun/enterprise/deployment/OrderingDescriptorTest.java Sending appserver/extras/javaee/manifest-jar/src/main/resources/META-INF/MANIFEST.MF Sending appserver/javaee-api/javax.javaee/pom.xml Sending appserver/javaee-api/javax.javaee/src/main/assembly/api-assembly.xml Sending appserver/javaee-api/javax.javaee/src/main/assembly/web-api-assembly.xml Sending appserver/jdbc/admin/src/test/resources/DomainTest.xml Sending appserver/paas/console/plugin-system/pom.xml Sending appserver/paas/console/plugin-system-jsf/pom.xml Sending appserver/paas/console/plugins/example/pom.xml Sending appserver/paas/console/pom.xml Sending appserver/paas/console/webapp/pom.xml Sending appserver/packager/glassfish-jsf/pom.xml Sending appserver/packager/glassfish-jsf/src/main/resources/pkg_proto.py Sending appserver/packager/pom.xml Sending appserver/tests/embedded/maven-plugin/jsftest/pom.xml Sending appserver/tests/embedded/web/web-war/test/pom.xml Sending appserver/verifier/verifier-impl/src/main/java/com/sun/enterprise/tools/verifier/web/WebVerifier.java Sending appserver/web/jsf-connector/pom.xml Sending appserver/web/jsf-connector/src/main/resources/META-INF/services/org.glassfish.faces.integration.GlassFishInjectionProvider Sending appserver/web/web-glue/src/main/java/com/sun/enterprise/web/WebModuleListener.java Sending appserver/web/weld-integration/pom.xml Sending javadoc.xml Sending nucleus/common/common-util/src/test/resources/v2domain.xml Sending nucleus/core/kernel/src/test/resources/DomainTest.xml Sending nucleus/packager/nucleus-base/bin/jspc Sending nucleus/packager/nucleus-base/bin/jspc.bat Sending nucleus/packager/nucleus-base/lib/templates/default-web.xml Sending pom.xml Transmitting file data .............................. Committed revision 51418.

javaserverfaces commented 12 years ago

@manfredriem said: Closing resolved issue out

javaee / mojarra

Refactor build system to conform to EE maven rules #2032

Index: nucleus/packager/nucleus-base/lib/templates/default-web.xml

svn log -r 9240

SECTION: Modified Files

SECTION: Modified Files

SECTION: Modified Files

SECTION: Modified Files

SECTION: Modified Files

SECTION: Modified Files