dev@javaserverfaces.java.net

Heads up: build system changes in trunk.

From: Ed Burns <edward.burns_at_oracle.com>
Date: Wed, 27 Jul 2011 09:55:00 -0700

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

Conform to Maven and OSGi Packaging and Naming Standards. Part 1 of 2 http://java.net/jira/browse/JAVASERVERFACES-2028

This part makes it so the Oracle Mojarra JSF Implementation is packaged
and delivered in one jar named javax.faces.jar instead of two jars named
jsf-api.jar and jsf-impl.jar. Part 2 will be to make it so the build
can also produce the javax.faces-api.jar, per the rules.

SECTION: Modified Files
----------------------------
M docs/releasenotes.html
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/test-app.xml
M common/ant/glassfishV3/container.xml
M common/ant/maven.xml
M common/ant/wls_10_3_4_no_cluster/container.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/tomcat6/container.xml
M common/ant/glassfishV3prelude/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/build.xml
M jsf-ri/systest-per-webapp/build.xml
M injectionprovider/build.xml
M 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/custom-tag/build.xml
M jsf-demo/ajax-component/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.xml
M jsf-demo/build-tests.xml
M jsf-demo/guessNumber/build.xml
M jsf-demo/basic-ajax/build.xml
M jsf-demo/helloworld/build.xml
M jsf-demo/basic-ezcomp/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


SECTION: Diffs
----------------------------
Index: docs/releasenotes.html
===================================================================
--- docs/releasenotes.html (revision 9221)
+++ docs/releasenotes.html (working copy)
@@ -85,7 +85,7 @@
     </tr>
     <tr>
         <td>
- jsf-api.jar
+ javax.faces-api.jar
         </td>
         <td>
             This JAR contains all of the public APIs as described by the
@@ -94,10 +94,10 @@
     </tr>
     <tr>
         <td>
- jsf-impl.jar
+ javax.faces.jar
         </td>
         <td>
- This JAR contains the runtime implementation per the specification.
+ This JAR contains the API and the runtime implementation per the specification.
         </td>
     </tr>
 </table>
Index: common/ant/glassfish/container.xml
===================================================================
--- common/ant/glassfish/container.xml (revision 9221)
+++ common/ant/glassfish/container.xml (working copy)
@@ -190,10 +190,10 @@
               description="Deploy the JSF Implementation artifacts to the target container.">
       <mkdir dir="${dist.dir}" />
       <mkdir dir="${dist.dir}/tmp" />
- <unjar src="${impl.dir}/build/lib/jsf-impl.jar"
+ <unjar src="${impl.dir}/build/lib/javax.faces.jar"
              dest="${dist.dir}/tmp" />
       <delete dir="${dist.dir}/tmp/com/sun/org/apache" />
- <jar destfile="${dist.dir}/jsf-impl.jar"
+ <jar destfile="${dist.dir}/javax.faces.jar"
            basedir="${dist.dir}/tmp" />
 
             <if>
@@ -209,10 +209,10 @@
                 </fileset>
             </delete>
             <jar jarfile="${container.home}/lib/javaee.jar" update="yes">
- <zipfileset src="${api.dir}/build/lib/jsf-api.jar"/>
+ <zipfileset src="${api.dir}/build/lib/jsf-api-intermediate.jar"/>
             </jar>
             <copy overwrite="true" todir="${container.home}/lib"
- file="${dist.dir}/jsf-impl.jar"/>
+ file="${dist.dir}/javax.faces.jar"/>
             <!--
             <copy overwrite="true" todir="${container.home}/lib"
                   file="${validation-api.jar}"/>
@@ -224,7 +224,7 @@
                 </then>
             </if>
             <delete dir="${dist.dir}/tmp" />
- <delete file="${dist.dir}/jsf-impl.jar" />
+ <delete file="${dist.dir}/javax.faces.jar" />
     </target>
 
     <target name="container.deploy.test.dependencies"
Index: common/ant/common.xml
===================================================================
--- common/ant/common.xml (revision 9221)
+++ common/ant/common.xml (working copy)
@@ -92,9 +92,14 @@
     <property name="regression.test.results.dir"
               value="${regression.test.dir}/build/testresults" />
 
+ <!-- Name -->
+ <property name="api-artifact-id" value="javax.faces-api"/>
+ <property name="impl-artifact-id" value="javax.faces"/>
+
     <!-- Artifacts of interest -->
- <property name="jsf-api.jar" value="${api.dir}/build/lib/jsf-api.jar"/>
- <property name="jsf-impl.jar" value="${impl.dir}/build/lib/jsf-impl.jar"/>
+ <property name="jsf-api-intermediate.jar" value="${api.dir}/build/lib/jsf-api-intermediate.jar"/>
+ <property name="javax.faces-api.jar" value="${api.dir}/build/lib/${api-artifact-id}.jar"/>
+ <property name="javax.faces.jar" value="${impl.dir}/build/lib/${impl-artifact-id}.jar"/>
     <property name="jsf.test.jar" value="${jsf.build.home}/lib/jsf-extensions-test-time.jar"/>
     <property name="installer.jar" value="${jsf.build.home}/common/lib/installer-builder.jar"/>
     <property name="javanettasks.jar" value="${jsf.build.home}/common/lib/javanettasks-1.0.5.jar"/>
@@ -111,7 +116,6 @@
     <property name="impl.version" value="${impl.version.number}-${build.type}"/>
     <property name="full.impl.version" value="${impl.version.number} (${build.number}-${build.type})"/>
     <property name="snapshot.version" value="${impl.version.number}-SNAPSHOT"/>
- <property name="groupId" value="com.sun.faces"/>
 
     <!-- Environment -->
     <property environment="myenv" />
@@ -375,7 +379,7 @@
                 <then>
                     <echo message="Adding dependent libraries..."/>
 
- <for list="${jsf-impl.jar},${jsf-api.jar},${webapp.jars}"
+ <for list="${javax.faces.jar},${jsf-api-intermediate.jar},${webapp.jars}"
                          param="jar">
                         <sequential>
                             <echo message="JAR: @{jar}"/>
@@ -474,7 +478,7 @@
                   fork="true">
                 <classpath>
                     <path refid="compile.classpath"/>
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                     <pathelement location="${tools.dir}/build/classes"/>
                 </classpath>
                 <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
Index: common/ant/glassfishV3.1_no_cluster/container.xml
===================================================================
--- common/ant/glassfishV3.1_no_cluster/container.xml (revision 9221)
+++ common/ant/glassfishV3.1_no_cluster/container.xml (working copy)
@@ -213,7 +213,7 @@
         <echo message="PENDING - Please implement"/>
     </target>
 
- <target name="container.deploy"
+ <target name="container.deploy" depends="patch.default-web.xml"
             description="Deploy the JSF Implementation artifacts to the target container.">
         <if>
             <os family="windows"/>
@@ -222,8 +222,7 @@
             </then>
         </if>
 
- <copy overwrite="true" file="${api.dir}/build/lib/jsf-api.jar" toFile="${container.home}/modules/jsf-api.jar"/>
- <copy overwrite="true" file="${impl.dir}/build/lib/jsf-impl.jar" toFile="${container.home}/modules/jsf-impl.jar"/>
+ <copy overwrite="true" file="${impl.dir}/build/lib/javax.faces.jar" toFile="${container.home}/modules/javax.faces.jar"/>
 
         <if>
             <os family="windows"/>
@@ -236,6 +235,56 @@
         </if>
     </target>
 
+ <target name="patch.default-web.xml" depends="test.patch.already.applied"
+ unless="default-web.xml.patch.already.applied">
+
+ <property name="patchfile-01"
+ value="${jsf.build.home}/common/ant/${container.name}/lib_templates_default-web_xml.patch" />
+ <property name="patchdir-01"
+ value="${container.home}/lib/templates" />
+
+ <echo message="running patch in ${patchdir-01} using patchfile ${patchfile-01}" />
+ <patch dir="${patchdir-01}" patchfile="${patchfile-01}"
+ failonerror="false" />
+
+ <property name="patchfile-02"
+ value="${jsf.build.home}/common/ant/${container.name}/domains_domain1_config_default-web_xml.patch" />
+ <property name="patchdir-02"
+ value="${container.home}/domains/domain1/config" />
+
+ <echo message="running patch in ${patchdir-02} using patchfile ${patchfile-02}" />
+ <patch dir="${patchdir-02}" patchfile="${patchfile-02}"
+ failonerror="false" />
+
+
+ </target>
+
+ <target name="test.patch.already.applied">
+
+ <loadfile property="lib.templates.default-web.xml"
+ srcFile="${container.home}/lib/templates/default-web.xml" />
+ <condition property="default-web.xml-01">
+ <contains string="${lib.templates.default-web.xml}"
+ substring="javax.faces.jar" />
+ </condition>
+
+ <loadfile property="domains.domain1.config.default-web.xml"
+ srcFile="${container.home}/domains/domain1/config/default-web.xml" />
+ <condition property="default-web.xml-02">
+ <contains string="${domains.domain1.config.default-web.xml}"
+ substring="javax.faces.jar" />
+ </condition>
+
+ <condition property="default-web.xml.patch.already.applied">
+ <and>
+ <isset property="default-web.xml-01" />
+ <isset property="default-web.xml-02" />
+ </and>
+ </condition>
+ <echo message="default-web.xml patches already applied: ${default-web.xml.patch.already.applied}"/>
+
+ </target>
+
     <target name="define.scenario.aware.port">
       <property name="scenario.aware.port" value="${container.port}" />
     </target>
Index: common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch
===================================================================
--- common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch (revision 0)
+++ common/ant/glassfishV3.1_no_cluster/lib_templates_default-web_xml.patch (revision 0)
@@ -0,0 +1,13 @@
+--- default-web.xml.orig Wed Jul 27 11:30:54 2011
++++ default-web.xml Wed Jul 27 11:33:42 2011
+@@ -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
Index: common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch
===================================================================
--- common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch (revision 0)
+++ common/ant/glassfishV3.1_no_cluster/domains_domain1_config_default-web_xml.patch (revision 0)
@@ -0,0 +1,13 @@
+--- default-web.xml.orig Wed Jul 27 11:36:33 2011
++++ default-web.xml Wed Jul 27 11:36:46 2011
+@@ -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
Index: common/ant/source-build-setup.xml
===================================================================
--- common/ant/source-build-setup.xml (revision 9221)
+++ common/ant/source-build-setup.xml (working copy)
@@ -89,9 +89,9 @@
     <property name="api.test.results.dir" value="${api.dir}/testresults"/>
 
     <!-- Artifacts of interest -->
- <property name="jsf-api.jar" value="${api.dir}/build/lib/jsf-api.jar"/>
+ <property name="jsf-api-intermediate.jar" value="${api.dir}/build/lib/jsf-api-intermediate.jar"/>
     <property name="jsf-tools.jar" value="${tools.dir}/build/lib/jsf-tools.jar"/>
- <property name="jsf-impl.jar" value="${impl.dir}/build/lib/jsf-impl.jar"/>
+ <property name="javax.faces.jar" value="${impl.dir}/build/lib/javax.faces.jar"/>
     <property name="jsf.test.jar" value="${jsf.build.home}/lib/jsf-extensions-test-time.jar"/>
     <property name="installer.jar" value="${jsf.build.home}/common/lib/installer-builder.jar"/>
     <property name="javanettasks.jar" value="${jsf.build.home}/common/lib/javanettasks-1.0.5.jar"/>
@@ -286,7 +286,7 @@
                   fork="true">
                 <classpath>
                     <path refid="compile.classpath"/>
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                     <pathelement location="${tools.dir}/build/classes"/>
                 </classpath>
                 <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
Index: common/ant/glassfishV3.1/container.xml
===================================================================
--- common/ant/glassfishV3.1/container.xml (revision 9221)
+++ common/ant/glassfishV3.1/container.xml (working copy)
@@ -238,7 +238,7 @@
         <echo message="PENDING - Please implement"/>
     </target>
 
- <target name="container.deploy"
+ <target name="container.deploy" depends="patch.default-web.xml"
             description="Deploy the JSF Implementation artifacts to the target container.">
         <if>
             <os family="windows"/>
@@ -247,8 +247,7 @@
             </then>
         </if>
 
- <copy overwrite="true" file="${api.dir}/build/lib/jsf-api.jar" toFile="${container.home}/modules/jsf-api.jar"/>
- <copy overwrite="true" file="${impl.dir}/build/lib/jsf-impl.jar" toFile="${container.home}/modules/jsf-impl.jar"/>
+ <copy overwrite="true" file="${impl.dir}/build/lib/javax.faces.jar" toFile="${container.home}/modules/javax.faces.jar"/>
 
         <if>
             <os family="windows"/>
@@ -261,6 +260,57 @@
         </if>
     </target>
 
+ <target name="patch.default-web.xml" depends="test.patch.already.applied"
+ unless="default-web.xml.patch.already.applied">
+
+ <property name="patchfile-01"
+ value="${jsf.build.home}/common/ant/${container.name}/lib_templates_default-web_xml.patch" />
+ <property name="patchdir-01"
+ value="${container.home}/lib/templates" />
+
+ <echo message="running patch in ${patchdir-01} using patchfile ${patchfile-01}" />
+ <patch dir="${patchdir-01}" patchfile="${patchfile-01}"
+ failonerror="false" />
+
+ <property name="patchfile-02"
+ value="${jsf.build.home}/common/ant/${container.name}/domains_domain1_config_default-web_xml.patch" />
+ <property name="patchdir-02"
+ value="${container.home}/domains/domain1/config" />
+
+ <echo message="running patch in ${patchdir-02} using patchfile ${patchfile-02}" />
+ <patch dir="${patchdir-02}" patchfile="${patchfile-02}"
+ failonerror="false" />
+
+
+ </target>
+
+ <target name="test.patch.already.applied">
+
+ <loadfile property="lib.templates.default-web.xml"
+ srcFile="${container.home}/lib/templates/default-web.xml" />
+ <condition property="default-web.xml-01">
+ <contains string="${lib.templates.default-web.xml}"
+ substring="javax.faces.jar" />
+ </condition>
+
+ <loadfile property="domains.domain1.config.default-web.xml"
+ srcFile="${container.home}/domains/domain1/config/default-web.xml" />
+ <condition property="default-web.xml-02">
+ <contains string="${domains.domain1.config.default-web.xml}"
+ substring="javax.faces.jar" />
+ </condition>
+
+ <condition property="default-web.xml.patch.already.applied">
+ <and>
+ <isset property="default-web.xml-01" />
+ <isset property="default-web.xml-02" />
+ </and>
+ </condition>
+ <echo message="default-web.xml patches already applied: ${default-web.xml.patch.already.applied}"/>
+
+ </target>
+
+
     <target name="container.deploy.test.dependencies"
             description="Deploy any container level dependencies to the container.">
         <if>
Index: common/ant/glassfishV3.1/lib_templates_default-web_xml.patch
===================================================================
--- common/ant/glassfishV3.1/lib_templates_default-web_xml.patch (revision 0)
+++ common/ant/glassfishV3.1/lib_templates_default-web_xml.patch (revision 0)
@@ -0,0 +1,13 @@
+--- default-web.xml.orig Wed Jul 27 11:30:54 2011
++++ default-web.xml Wed Jul 27 11:33:42 2011
+@@ -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
Index: common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch
===================================================================
--- common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch (revision 0)
+++ common/ant/glassfishV3.1/domains_domain1_config_default-web_xml.patch (revision 0)
@@ -0,0 +1,13 @@
+--- default-web.xml.orig Wed Jul 27 11:36:33 2011
++++ default-web.xml Wed Jul 27 11:36:46 2011
+@@ -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
Index: common/ant/test-app.xml
===================================================================
--- common/ant/test-app.xml (revision 9221)
+++ common/ant/test-app.xml (working copy)
@@ -46,8 +46,7 @@
 
   <!-- Construct compile classpath -->
   <path id="test.compile.classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${javax-enterprise.jar}"/>
         <pathelement location="${javax-inject.jar}"/>
         <pathelement location="${jsf.test.jar}"/>
Index: common/ant/glassfishV3/container.xml
===================================================================
--- common/ant/glassfishV3/container.xml (revision 9221)
+++ common/ant/glassfishV3/container.xml (working copy)
@@ -177,8 +177,7 @@
             </then>
         </if>
 
- <copy overwrite="true" file="${api.dir}/build/lib/jsf-api.jar" toFile="${container.home}/modules/jsf-api.jar"/>
- <copy overwrite="true" file="${impl.dir}/build/lib/jsf-impl.jar" toFile="${container.home}/modules/jsf-impl.jar"/>
+ <copy overwrite="true" file="${impl.dir}/build/lib/javax.faces.jar" toFile="${container.home}/modules/javax.faces.jar"/>
 
         <if>
             <os family="windows"/>
Index: common/ant/maven.xml
===================================================================
--- common/ant/maven.xml (revision 9221)
+++ common/ant/maven.xml (working copy)
@@ -151,7 +151,7 @@
                       <fileset dir="${api.dir}/build/generate/"
                                includes="**/*" excludes="last-generation" />
                     </copy>
- <unjar src="${api.dir}/build/lib/jsf-api.jar"
+ <unjar src="${jsf-api-intermediate.jar}"
                            overwrite="yes"
                            dest="${mvn.api.dir}/target/classes"/>
                     <jsf.mvn pomFile="${mvn.api.dir}/jsf-api-pom.xml"
@@ -173,7 +173,7 @@
                       <fileset dir="${impl.dir}/build/generate/"
                                includes="**/*" excludes="last-generation,conf/**,**/*.xsd" />
                     </copy>
- <unjar src="${impl.dir}/build/lib/jsf-impl.jar"
+ <unjar src="${impl.dir}/build/lib/javax.faces.jar"
                            overwrite="yes"
                            dest="${mvn.impl.dir}/target/classes"/>
                     <jsf.mvn pomFile="${mvn.impl.dir}/jsf-impl-pom.xml"
Index: common/ant/wls_10_3_4_no_cluster/container.xml
===================================================================
--- common/ant/wls_10_3_4_no_cluster/container.xml (revision 9221)
+++ common/ant/wls_10_3_4_no_cluster/container.xml (working copy)
@@ -239,10 +239,7 @@
     <target name="container.deploy" depends="define.wls.properties"
             description="Deploy the JSF Implementation artifacts to the target container.">
      
- <mkdir dir="${maven.repo.local}/${groupPath}/jsf-api/${impl.version}" />
- <copy file="${jsf.build.home}/jsf-api/build/lib/jsf-api.jar" overwrite="true"
- tofile="${maven.repo.local}/${groupPath}/jsf-api/${impl.version}/jsf-api-${impl.version}.jar" />
- <copy file="${jsf.build.home}/jsf-ri/build/lib/jsf-impl.jar" overwrite="true"
+ <copy file="${jsf.build.home}/jsf-ri/build/lib/javax.faces.jar" overwrite="true"
             tofile="${maven.repo.local}/${groupPath}/jsf-impl/${impl.version}/jsf-impl-${impl.version}.jar" />
 
       <if>
@@ -262,10 +259,8 @@
                dir="${jsf.build.home}/common/ant/${container.name}/wls-jsf" goals="clean install" />
       <container.stop />
 
- <copy file="${jsf.build.home}/jsf-api/build/lib/jsf-api.jar" overwrite="true"
+ <copy file="${jsf.build.home}/jsf-ri/build/lib/javax.faces.jar" overwrite="true"
             todir="${wl.home}/server/lib/consoleapp/webapp/WEB-INF/lib" />
- <copy file="${jsf.build.home}/jsf-ri/build/lib/jsf-impl.jar" overwrite="true"
- todir="${wl.home}/server/lib/consoleapp/webapp/WEB-INF/lib" />
       <container.start />
       <wldeploy action="deploy"
                 appversion="${impl.version.number}"
Index: common/ant/template/container.xml
===================================================================
--- common/ant/template/container.xml (revision 9221)
+++ common/ant/template/container.xml (working copy)
@@ -122,7 +122,7 @@
     
     <!--
         OPTIONAL
- Update the jsf-impl.jar's manfest file
+ Update the javax.faces.jar's manfest file
           with the versions of the compile time
           dependencies.
     -->
Index: common/ant/template/jsf-impl-pom-template.xml
===================================================================
--- common/ant/template/jsf-impl-pom-template.xml (revision 9221)
+++ common/ant/template/jsf-impl-pom-template.xml (working copy)
@@ -221,25 +221,25 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <artifactId>javax.el-api</artifactId>
+ <version>2.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl-api</artifactId>
             <version>1.2</version>
             <scope>provided</scope>
         </dependency>
Index: common/ant/template/jsf-api-pom-template.xml
===================================================================
--- common/ant/template/jsf-api-pom-template.xml (revision 9221)
+++ common/ant/template/jsf-api-pom-template.xml (working copy)
@@ -43,8 +43,8 @@
 
 <project>
     <modelVersion>4.0.0</modelVersion>
- <groupId>@groupId@</groupId>
- <artifactId>jsf-api</artifactId>
+ <groupId>javax.faces</groupId>
+ <artifactId>javax.faces-api</artifactId>
     <version>@version@</version>
     <packaging>jar</packaging>
     <name>
@@ -71,7 +71,7 @@
         <developer>
             <id>edburns</id>
             <name>Ed Burns</name>
- <email>ed.burns_at_sun.com</email>
+ <email>edward.burns_at_oracle.com</email>
             <organization>Oracle America, Inc.</organization>
             <roles>
                 <role>project-owner</role>
@@ -79,71 +79,23 @@
             <timezone>-6</timezone>
         </developer>
         <developer>
- <id>rlubke</id>
- <name>Ryan Lubke</name>
- <email>Ryan.Lubke_at_sun.com</email>
- <organization>Oracle America, Inc.</organization>
- <roles>
- <role>project-owner</role>
- </roles>
- <timezone>-9</timezone>
- </developer>
- <developer>
             <id>rogerk</id>
             <name>Roger Kitain</name>
- <email>Roger.Kitain_at_sun.com</email>
+ <email>roger.kitain_at_oracle.com</email>
             <organization>Oracle America, Inc.</organization>
             <roles>
                 <role>project-owner</role>
             </roles>
             <timezone>-6</timezone>
         </developer>
- <developer>
- <id>driscoll</id>
- <name>Jim Driscoll</name>
- <email>jim.dirscoll_at_sun.com</email>
- <organization>Oracle America, Inc.</organization>
- <roles>
- <role>project-owner</role>
- </roles>
- <timezone>-9</timezone>
- </developer>
     </developers>
 
     <repositories>
         <repository>
- <snapshots/>
- <id>ibiblio</id>
- <url>http://www.ibiblio.org/maven2/</url>
- </repository>
- <repository>
- <id>java.net-maven2-repository</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/2/</url>
- <layout>default</layout>
- </repository>
- <repository>
- <snapshots/>
- <id>codehaus</id>
- <name>codehaus</name>
- <url>http://repository.codehaus.org</url>
- </repository>
- <repository>
- <snapshots/>
             <id>java.net</id>
- <name>Java.net Maven 1.x Repository for external projects</name>
- <url>http://download.java.net/maven/1/</url>
- <layout>legacy</layout>
+ <name>The repo from which jars are copied to maven central</name>
+ <url>https://maven.java.net/content/repositories/releases</url>
         </repository>
- <repository>
- <snapshots/>
- <id>java.net.shared</id>
- <name>Java.net Maven 1.x Repository for glassfish dependencies
- </name>
- <url>http://download.java.net/javaee5/external/shared</url>
- <layout>legacy</layout>
- </repository>
-
     </repositories>
 
     <distributionManagement>
@@ -204,22 +156,24 @@
     </build>
 
     <issueManagement>
- <system>issueZilla</system>
- <url>
- https://javaserverfaces.dev.java.net/servlets/ProjectIssues
- </url>
+ <system>jira</system>
+ <url>http://java.net/jira/browse/JAVASERVERFACES_SPEC_PUBLIC</url>
     </issueManagement>
     <mailingLists>
         <mailingList>
             <name>JSF 2.2 Specification Comments</name>
- <post>jsr-314-comments_at_jcp.org</post>
+ <post>jsr-344-comments_at_jcp.org</post>
+ <archive>http://java.net/projects/javaserverfaces-spec-public/lists/users/archive</archive>
         </mailingList>
         <mailingList>
+ <name>JSF 2.2 Specification Users</name>
+ <post>users_at_javaserverfaces-spec-public.java.net</post>
+ <archive>http://java.net/projects/javaserverfaces-spec-public/lists/users/archive</archive>
+ </mailingList>
+ <mailingList>
             <name>Mojarra Implementation Dev List</name>
- <post>dev_at_javaserverfaces.dev.java.net</post>
- <archive>
- https://javaserverfaces.dev.java.net/servlets/SummarizeList?listName=dev
- </archive>
+ <post>dev_at_javaserverfaces.java.net</post>
+ <archive>http://java.net/projects/javaserverfaces/lists/dev/archive</archive>
         </mailingList>
     </mailingLists>
     <contributors>
@@ -264,25 +218,25 @@
     <dependencies>
         <dependency>
             <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <version>2.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <artifactId>javax.el-api</artifactId>
+ <version>2.2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>jstl-api</artifactId>
             <version>1.2</version>
             <scope>provided</scope>
         </dependency>
Index: common/ant/tomcat6/container.xml
===================================================================
--- common/ant/tomcat6/container.xml (revision 9221)
+++ common/ant/tomcat6/container.xml (working copy)
@@ -119,7 +119,7 @@
     
     <!--
         OPTIONAL
- Update the jsf-impl.jar's manfest file
+ Update the javax.faces.jar's manfest file
           with the versions of the compile time
           dependencies.
     -->
@@ -135,8 +135,7 @@
     -->
     <target name="container.deploy"
             description="Deploy the JSF Implementation artifacts to the target container.">
- <copy overwrite="true" file="${api.dir}/build/lib/jsf-api.jar" toFile="${container.home}/lib/jsf-api.jar"/>
- <copy overwrite="true" file="${impl.dir}/build/lib/jsf-impl.jar" toFile="${container.home}/lib/jsf-impl.jar"/>
+ <copy overwrite="true" file="${impl.dir}/build/lib/javax.faces.jar" toFile="${container.home}/lib/javax.faces.jar"/>
     </target>
 
 
Index: common/ant/glassfishV3prelude/container.xml
===================================================================
--- common/ant/glassfishV3prelude/container.xml (revision 9221)
+++ common/ant/glassfishV3prelude/container.xml (working copy)
@@ -176,8 +176,7 @@
             </then>
         </if>
 
- <copy file="${api.dir}/build/lib/jsf-api.jar" toFile="${container.home}/modules/jsf-api.jar"/>
- <copy file="${impl.dir}/build/lib/jsf-impl.jar" toFile="${container.home}/modules/web/jsf-impl.jar"/>
+ <copy file="${impl.dir}/build/lib/javax.faces.jar" toFile="${container.home}/modules/web/javax.faces.jar"/>
 
         <if>
             <os family="windows"/>
Index: common/ant/tomcat7/container.xml
===================================================================
--- common/ant/tomcat7/container.xml (revision 9221)
+++ common/ant/tomcat7/container.xml (working copy)
@@ -124,7 +124,7 @@
     
     <!--
         OPTIONAL
- Update the jsf-impl.jar's manfest file
+ Update the javax.faces.jar's manfest file
           with the versions of the compile time
           dependencies.
     -->
@@ -140,8 +140,7 @@
     -->
     <target name="container.deploy"
             description="Deploy the JSF Implementation artifacts to the target container.">
- <copy overwrite="true" file="${api.dir}/build/lib/jsf-api.jar" toFile="${container.home}/lib/jsf-api.jar"/>
- <copy overwrite="true" file="${impl.dir}/build/lib/jsf-impl.jar" toFile="${container.home}/lib/jsf-impl.jar"/>
+ <copy overwrite="true" file="${impl.dir}/build/lib/javax.faces.jar" toFile="${container.home}/lib/javax.faces.jar"/>
         <copy overwrite="true" file="${jstl.jar}" todir="${container.home}/lib"/>
     </target>
 
Index: jsf-api/interim-pom.xml
===================================================================
--- jsf-api/interim-pom.xml (revision 9221)
+++ jsf-api/interim-pom.xml (working copy)
@@ -185,7 +185,7 @@
                                         <pathelement location="${commons-digester.jar}" />
                                         <pathelement location="${commons-collections.jar}" />
                                         <pathelement location="${commons-logging.jar}" />
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                                         <pathelement location="${tools.dir}/build/classes"/>
                                     </classpath>
                                     <assertions>
Index: jsf-api/mojarra-jsf-api.bnd
===================================================================
--- jsf-api/mojarra-jsf-api.bnd (revision 9221)
+++ jsf-api/mojarra-jsf-api.bnd (working copy)
@@ -88,11 +88,13 @@
 Import-Package: javax.servlet.jsp.jstl.*;version=1.2,\
   javax.validation.*;resolution:=optional, \
   javax.servlet.jsp.*;version=2.1,\
- javax.servlet.*;version=2.4,\
- javax.el.*;version=2.1
+ javax.servlet.*;version=3.0,\
+ javax.el.*;version=2.2.1
 DynamicImport-Package: org.glassfish.flashlight.provider
 Include-Resource: META-INF=build/classes/META-INF,build/classes
 Bundle-Version: @osgi.version@
-Bundle-Name: Mojarra JSF API Implementation @full.impl.version@
+Bundle-Name: JavaServer Faces API @full.impl.version@
 Bundle-Description: Mojarra JSF API (javax.faces/_at_spec.version@) @full.impl.version@
 Bundle-SymbolicName: org.glassfish.javax.faces
+Bundle-License: http://glassfish.java.net/nonav/public/CDDL+GPL.html
+Bundle-DocURL: http://download.oracle.com/javaee/6/api/
Index: jsf-api/build-source.xml
===================================================================
--- jsf-api/build-source.xml (revision 9221)
+++ jsf-api/build-source.xml (working copy)
@@ -74,7 +74,6 @@
     <property name="build.mifdocs.dir" value="${build.dir}/mifdocs"/>
     <property name="javadoc.private" value="false"/>
     <property name="javadoc.protected" value="true"/>
- <property name="artifact-id" value="jsf-api"/>
 
     <property name="assertion.classes" value="-ea:javax.faces..."/>
     <property name="name" value="jsf-api"/>
@@ -215,7 +214,7 @@
                 <pathelement location="${commons-digester.jar}" />
                 <pathelement location="${commons-collections.jar}" />
                 <pathelement location="${commons-logging.jar}" />
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                 <pathelement location="${tools.dir}/build/classes"/>
             </classpath>
             <assertions>
@@ -254,7 +253,7 @@
             <classpath>
                 <path refid="apache.commons.classpath"/>
                 <path refid="compile.classpath"/>
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                 <pathelement location="${tools.dir}/build/classes"/>
             </classpath>
             <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
Index: jsf-api/build.xml
===================================================================
--- jsf-api/build.xml (revision 9221)
+++ jsf-api/build.xml (working copy)
@@ -74,10 +74,9 @@
     <property name="build.mifdocs.dir" value="${build.dir}/mifdocs"/>
     <property name="javadoc.private" value="false"/>
     <property name="javadoc.protected" value="true"/>
- <property name="artifact-id" value="jsf-api"/>
 
     <property name="assertion.classes" value="-ea:javax.faces..."/>
- <property name="name" value="jsf-api"/>
+ <property name="name" value="jsf-api-intermediate"/>
     <property name="DocName" value="JavaServer Faces API"/>
 
     <path id="test.classpath">
@@ -217,7 +216,7 @@
                 <pathelement location="${commons-digester.jar}" />
                 <pathelement location="${commons-collections.jar}" />
                 <pathelement location="${commons-logging.jar}" />
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                 <pathelement location="${jsf-tools.jar}"/>
                 <pathelement location="${tools.dir}/build/classes"/>
             </classpath>
@@ -259,7 +258,7 @@
             <classpath>
                 <path refid="apache.commons.classpath"/>
                 <path refid="compile.classpath"/>
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
                 <pathelement location="${jsf-tools.jar}"/>
                 <pathelement location="${tools.dir}/build/classes"/>
             </classpath>
@@ -883,6 +882,12 @@
         <condition property="exec.name" value="cmd.exe">
             <os family="windows"/>
         </condition>
+ <condition property="exec.name" value="${java.home}/bin/javac">
+ <available file="${java.home}/bin/javac"/>
+ </condition>
+ <condition property="exec.name" value="${java.home}/../bin/javac">
+ <available file="${java.home}/../bin/javac"/>
+ </condition>
         <condition property="exec.arg.1"
                    value="/c ${java.home}/bin/javac">
             <os family="windows"/>
@@ -901,7 +906,7 @@
             <arg line="-Acom.sun.tools.javac.sym.Dest=${build.lib.dir}/jsf-api-stripped"/>
             <arg line="${src.paths}"/>
         </exec>
- <!-- jar up the stripped files into jsf-api.jar. -->
+ <!-- jar up the stripped files into jsf-api-intermediate.jar. -->
         <!-- Extract the original manifest -->
         <unjar src="${build.lib.dir}/${name}-full.jar"
                dest="${build.lib.dir}/jsf-api-stripped">
@@ -948,7 +953,7 @@
         
     <target name="mvn.deploy.api.release.local" depends="strip.api.jar">
 
- <mvn.deploy.release.local groupId="javax.faces" version="${spec.version}" type="api"/>
+ <mvn.deploy.release.local version="${spec.version}" type="api"/>
     </target>
 
 
Index: jsf-ri/build-source.xml
===================================================================
--- jsf-ri/build-source.xml (revision 9221)
+++ jsf-ri/build-source.xml (working copy)
@@ -86,7 +86,7 @@
     <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
 
     <path id="impl.compile.classpath">
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
         <path refid="apache.commons.classpath"/>
         <path refid="compile.classpath"/>
         <pathelement location="${tools.dir}/build/classes"/>
@@ -323,7 +323,7 @@
             args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
         <!--
             RELEASE_PENDING (rlubke,driscoll)
- For now these are copied to the root of the jsf-impl.jar, but
+ For now these are copied to the root of the javax.faces.jar, but
             eventually they should be in com.sun.faces per the copy statement
             above.
         -->
Index: jsf-ri/build.xml
===================================================================
--- jsf-ri/build.xml (revision 9221)
+++ jsf-ri/build.xml (working copy)
@@ -80,7 +80,7 @@
 
     <!-- Misc -->
     <property name="conf.share.dir" value="${basedir}/conf/share"/>
- <property name="name" value="jsf-impl"/>
+ <property name="name" value="${impl-artifact-id}"/>
 
     <property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
     <property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
@@ -91,7 +91,7 @@
     <property name="DocName" value="Mojarra Implementation Javadoc"/>
 
     <path id="impl.compile.classpath">
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${jsf-api-intermediate.jar}"/>
         <path refid="apache.commons.classpath"/>
         <path refid="compile.classpath"/>
         <pathelement location="${jsf-tools.jar}"/>
@@ -283,7 +283,7 @@
     </target>
 
     <target name="compile" depends="prepare,generate,copy.template.sources"
- description="Just compile the classes">
+ description="Compile the classes and unjar the jsf-api-intermediate jar">
 
         <!-- Run javac through everything -->
         <jsf.javac srcdir="${source.dir}:${build.generate.dir}"
@@ -329,7 +329,7 @@
             args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
         <!--
             RELEASE_PENDING (rlubke,driscoll)
- For now these are copied to the root of the jsf-impl.jar, but
+ For now these are copied to the root of the javax.faces.jar, but
             eventually they should be in com.sun.faces per the copy statement
             above.
         -->
@@ -355,6 +355,12 @@
               toDir="${build.classes.dir}/com/sun/faces"/>
         <unzip src="${jsf.build.home}/lib/injectionproviders.jar"
                dest="${build.classes.dir}"/>
+ <unzip src="${jsf-api-intermediate.jar}"
+ dest="${build.classes.dir}">
+ <patternset>
+ <exclude name="META-INF/MANIFEST.MF" />
+ </patternset>
+ </unzip>
         <copy todir="${build.classes.dir}/META-INF">
             <fileset dir="${conf.share.dir}">
                 <include name="jsf_core.tld"/>
Index: jsf-ri/build-tests.xml
===================================================================
--- jsf-ri/build-tests.xml (revision 9221)
+++ jsf-ri/build-tests.xml (working copy)
@@ -81,8 +81,7 @@
     <!-- Compilation Classpath -->
     <path id="test.compile.classpath">
         <pathelement location="${conf.test.dir}"/>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${jsf.test.jar}"/>
         <path refid="compile.classpath"/>
         <path refid="cactus.compile.classpath"/>
@@ -92,8 +91,7 @@
     <path id="test.runtime.classpath">
         <pathelement location="${out.test.dir}/classes"/>
         <pathelement location="${conf.test.dir}"/>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${jsf.test.jar}"/>
         <!-- Temporary until javax.security is available on maven -->
         <pathelement location="${dependency.base.dir}/glassfish/lib/javaee.jar"/>
@@ -538,6 +536,14 @@
     </target>
 
    <target name="generate.reports">
+ <!-- Until http://issues.hudson-ci.org/browse/HUDSON-8716 is fixed
+ this find command will need to be run (to enable this to be listed
+ here as an xml comment, the right angle bracket, which is the
+ heart of the darn regexp, has been replaced with &gt;. You must
+ replace it back with right angle bracket before running the darn
+ find command.):
+find jsf-ri/testresults jsf-ri/testresults/systest jsf-test/build/testresults jsf-api/testresults -name .svn -prune -o -name "*.class" -prune -o -name "*.jar" -prune -o -type f -name "TEST*.xml" -exec perl -pi.bak -e "s/^&gt;//g" {} \; -print
+ -->
       <property name="test.report.dir" value="${basedir}/build/test-reports" />
       <mkdir dir="${test.report.dir}" />
       <mkdir dir="${test.report.dir}/html" />
Index: jsf-ri/maven.xml
===================================================================
--- jsf-ri/maven.xml (revision 9221)
+++ jsf-ri/maven.xml (working copy)
@@ -90,7 +90,7 @@
     <!-- <attainGoal name="jsf-impl:build" /> -->
     <mkdir dir="target/classes" />
     <unjar dest="target/classes" overwrite="true"
- src="build/lib/jsf-impl.jar" />
+ src="build/lib/javax.faces.jar" />
   </goal>
 
 </project>
Index: jsf-ri/mojarra-jsf-impl.bnd
===================================================================
--- jsf-ri/mojarra-jsf-impl.bnd (revision 9221)
+++ jsf-ri/mojarra-jsf-impl.bnd (working copy)
@@ -48,8 +48,12 @@
 Extension-Name: @extension.name@
 
 # BND/OSGI Properties
-Export-Package: com.sun.faces.*;version=_at_spec.version@
-Import-Package: javax.faces.*,javax.servlet.annotation.*;resolution:=optional,javax.servlet.*,javax.el.*,javax.annotation.*,javax.crypto.*,\
+Export-Package: javax.faces.*;version=_at_spec.version@,\
+ com.sun.faces.*;version=_at_spec.version@
+Import-Package: javax.faces.*,\
+ com.sun.faces.*,\
+ javax.servlet.annotation.*;resolution:=optional,\
+ javax.servlet.*,javax.el.*,javax.annotation.*,javax.crypto.*,\
   javax.validation.*;resolution:=optional, \
   javax.xml.*,org.w3c.dom.*, \
   com.sun.enterprise.*;resolution:=optional, \
Index: jsf-ri/systest/build.xml
===================================================================
--- jsf-ri/systest/build.xml (revision 9221)
+++ jsf-ri/systest/build.xml (working copy)
@@ -74,8 +74,7 @@
     <property name="context.path" value="/${test.suite.name}"/>
 
     <path id="systest.compile.classpath">
- <pathelement path="${jsf-api.jar}"/>
- <pathelement path="${jsf-impl.jar}"/>
+ <pathelement path="${javax.faces.jar}"/>
         <path refid="jsf.test.jar.classpath"/>
         <path refid="compile.classpath"/>
         <path refid="htmlunit.compile.classpath"/>
Index: jsf-ri/systest-per-webapp/build.xml
===================================================================
--- jsf-ri/systest-per-webapp/build.xml (revision 9221)
+++ jsf-ri/systest-per-webapp/build.xml (working copy)
@@ -58,8 +58,7 @@
 
     <!-- Construct compile classpath -->
     <path id="test.compile.classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${javax-enterprise.jar}"/>
         <pathelement location="${javax-inject.jar}"/>
         <pathelement location="${jsf.test.jar}"/>
Index: injectionprovider/build.xml
===================================================================
--- injectionprovider/build.xml (revision 9221)
+++ injectionprovider/build.xml (working copy)
@@ -57,8 +57,8 @@
 
     <path id="compile.classpath">
         <pathelement location="${servlet.jar}"/>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${glassfish.jar}"/>
         <pathelement location="${tomcat6.jar}"/>
         <pathelement location="${jetty.jar}" />
Index: build.xml
===================================================================
--- build.xml (revision 9221)
+++ build.xml (working copy)
@@ -461,9 +461,7 @@
                                    fromFile="${dist.dir}/mojarra-${impl.version}-source.zip"
                                    fileDescription="Mojarra ${impl.version.number} nightly source bundle."
                                    overwrite="yes"/>
- <echo message="Deploying jsf-api.jar snapshot to the java.net M2 repository..."/>
- <ant antfile="${api.dir}/build.xml" target="mvn.deploy.snapshot"/>
- <echo message="Deploying jsf-impl.jar snapshot to the java.net M2 repository..."/>
+ <echo message="Deploying javax.faces.jar snapshot to the java.net M2 repository..."/>
                     <ant antfile="${impl.dir}/build.xml" target="mvn.deploy.snapshot"/>
                 </sequential>
             </then>
@@ -509,8 +507,7 @@
     </target>
 
     <target name="updatecenter2" depends="main">
- <copy file="jsf-api/build/lib/jsf-api.jar" todir="updatecenter2/lib"/>
- <copy file="jsf-ri/build/lib/jsf-impl.jar" todir="updatecenter2/lib"/>
+ <copy file="jsf-ri/build/lib/javax.faces.jar" todir="updatecenter2/lib"/>
     </target>
 
 </project>
Index: contrib/sandbox/build.xml
===================================================================
--- contrib/sandbox/build.xml (revision 9221)
+++ contrib/sandbox/build.xml (working copy)
@@ -80,8 +80,7 @@
     <property name="sourceforge.mirror" value="http://superb-east.dl.sourceforge.net/sourceforge"/>
     
     <path id="impl.compile.classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="sun.commons.classpath"/>
         <path refid="compile.classpath"/>
         <pathelement location="${tools.dir}/build/classes"/>
@@ -224,7 +223,7 @@
             <classpath>
                 <path refid="sun.commons.classpath"/>
                 <path refid="compile.classpath"/>
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
                 <pathelement location="${tools.dir}/build/classes"/>
             </classpath>
             <assertions>
Index: jsf-demo/test/mappingDemo/build.xml
===================================================================
--- jsf-demo/test/mappingDemo/build.xml (revision 9221)
+++ jsf-demo/test/mappingDemo/build.xml (working copy)
@@ -62,8 +62,8 @@
 
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/guessNumber/build.xml
===================================================================
--- jsf-demo/archive/guessNumber/build.xml (revision 9221)
+++ jsf-demo/archive/guessNumber/build.xml (working copy)
@@ -52,8 +52,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/standard/build.xml
===================================================================
--- jsf-demo/archive/standard/build.xml (revision 9221)
+++ jsf-demo/archive/standard/build.xml (working copy)
@@ -52,8 +52,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/webtier-sample/build.xml
===================================================================
--- jsf-demo/archive/webtier-sample/build.xml (revision 9221)
+++ jsf-demo/archive/webtier-sample/build.xml (working copy)
@@ -52,8 +52,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/carstore/build.xml
===================================================================
--- jsf-demo/archive/carstore/build.xml (revision 9221)
+++ jsf-demo/archive/carstore/build.xml (working copy)
@@ -66,8 +66,8 @@
 
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${demo-components.jar}"/>
         <pathelement location="${jsf-demo.lib}/ui.jar"/>
         <pathelement location="${build}/WEB-INF/classes"/>
Index: jsf-demo/archive/j2meDemo/build.properties.sample
===================================================================
--- jsf-demo/archive/j2meDemo/build.properties.sample (revision 9221)
+++ jsf-demo/archive/j2meDemo/build.properties.sample (working copy)
@@ -71,7 +71,6 @@
 commons-collections.jar=${base.path}/lib/appserv-rt.jar
 commons-digester.jar=${base.path}/lib/appserv-rt.jar
 commons-logging.jar=${base.path}/lib/appserv-rt.jar
-jsf-api.jar=${base.path}/lib/jsf-api.jar
 jsf-impl.jar=${base.path}/lib/jsf-impl.jar
 jstl.jar=${base.path}/lib/appserv-jstl.jar
 servlet.jar=${base.path}/lib/j2ee.jar
Index: jsf-demo/archive/j2meDemo/build.xml
===================================================================
--- jsf-demo/archive/j2meDemo/build.xml (revision 9221)
+++ jsf-demo/archive/j2meDemo/build.xml (working copy)
@@ -55,8 +55,8 @@
     <property name="bundleName" value="article"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/components/build.xml
===================================================================
--- jsf-demo/archive/components/build.xml (revision 9221)
+++ jsf-demo/archive/components/build.xml (working copy)
@@ -62,8 +62,8 @@
 
     <path id="classpath">
         <pathelement location="${ui.jar}"/>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/nonjsp/build.xml
===================================================================
--- jsf-demo/archive/nonjsp/build.xml (revision 9221)
+++ jsf-demo/archive/nonjsp/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/renderkits/build.xml
===================================================================
--- jsf-demo/archive/renderkits/build.xml (revision 9221)
+++ jsf-demo/archive/renderkits/build.xml (working copy)
@@ -56,7 +56,7 @@
     <property name="jsf-demo.lib" value="../lib"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/archive/mojarra_ext/build.xml
===================================================================
--- jsf-demo/archive/mojarra_ext/build.xml (revision 9221)
+++ jsf-demo/archive/mojarra_ext/build.xml (working copy)
@@ -57,8 +57,8 @@
 
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <pathelement location="${jsf-demo.lib}/ui.jar"/>
         <path refid="compile.classpath"/>
Index: jsf-demo/archive/helloDuke/build.xml
===================================================================
--- jsf-demo/archive/helloDuke/build.xml (revision 9221)
+++ jsf-demo/archive/helloDuke/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/custom-tag/build.xml
===================================================================
--- jsf-demo/custom-tag/build.xml (revision 9221)
+++ jsf-demo/custom-tag/build.xml (working copy)
@@ -54,8 +54,8 @@
     <property name="lib" value="${basedir}/lib"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/ajax-component/build.xml
===================================================================
--- jsf-demo/ajax-component/build.xml (revision 9221)
+++ jsf-demo/ajax-component/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/custom-bean-scope/build.xml
===================================================================
--- jsf-demo/custom-bean-scope/build.xml (revision 9221)
+++ jsf-demo/custom-bean-scope/build.xml (working copy)
@@ -52,8 +52,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/bean-validator/build.xml
===================================================================
--- jsf-demo/bean-validator/build.xml (revision 9221)
+++ jsf-demo/bean-validator/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
        <fileset dir="${api.dir}" >
Index: jsf-demo/viewExpired/build.xml
===================================================================
--- jsf-demo/viewExpired/build.xml (revision 9221)
+++ jsf-demo/viewExpired/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/OpenAjaxBridge/build.xml
===================================================================
--- jsf-demo/sandbox/OpenAjaxBridge/build.xml (revision 9221)
+++ jsf-demo/sandbox/OpenAjaxBridge/build.xml (working copy)
@@ -56,8 +56,8 @@
     <property name="jsf-demo.lib" value="../lib"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <pathelement location="${jsf-demo.lib}/ui.jar"/>
         <path refid="compile.classpath"/>
Index: jsf-demo/sandbox/permalink/build.xml
===================================================================
--- jsf-demo/sandbox/permalink/build.xml (revision 9221)
+++ jsf-demo/sandbox/permalink/build.xml (working copy)
@@ -58,8 +58,8 @@
 
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <pathelement location="${jsf-demo.lib}/ui.jar"/>
         <path refid="compile.classpath"/>
Index: jsf-demo/sandbox/tree-visit/build.xml
===================================================================
--- jsf-demo/sandbox/tree-visit/build.xml (revision 9221)
+++ jsf-demo/sandbox/tree-visit/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/ajax-tag/build.xml
===================================================================
--- jsf-demo/sandbox/ajax-tag/build.xml (revision 9221)
+++ jsf-demo/sandbox/ajax-tag/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
 
Index: jsf-demo/sandbox/ezcomp00/build.xml
===================================================================
--- jsf-demo/sandbox/ezcomp00/build.xml (revision 9221)
+++ jsf-demo/sandbox/ezcomp00/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/ezcomp02/build.xml
===================================================================
--- jsf-demo/sandbox/ezcomp02/build.xml (revision 9221)
+++ jsf-demo/sandbox/ezcomp02/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/ezcomp03/build.xml
===================================================================
--- jsf-demo/sandbox/ezcomp03/build.xml (revision 9221)
+++ jsf-demo/sandbox/ezcomp03/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/ajax-queue/build.xml
===================================================================
--- jsf-demo/sandbox/ajax-queue/build.xml (revision 9221)
+++ jsf-demo/sandbox/ajax-queue/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/ajax-request/build.xml
===================================================================
--- jsf-demo/sandbox/ajax-request/build.xml (revision 9221)
+++ jsf-demo/sandbox/ajax-request/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <path refid="compile.classpath"/>
     </path>
     
Index: jsf-demo/sandbox/demo-standalone/build.xml
===================================================================
--- jsf-demo/sandbox/demo-standalone/build.xml (revision 9221)
+++ jsf-demo/sandbox/demo-standalone/build.xml (working copy)
@@ -46,8 +46,8 @@
     <taskdef resource="net/sf/antcontrib/antlib.xml"/>
     
     <property file="build.properties"/>
- <property name="jsf-api.jar" value="../lib/jsf-api.jar"/>
- <property name="jsf-impl.jar" value="../lib/jsf-impl.jar"/>
+ <property name="javax.faces-api.jar" value="../lib/javax.faces-api.jar"/>
+ <property name="javax.faces.jar" value="../lib/javax.faces.jar"/>
     <property name="ui.jar" value="${basedir}/ui.jar"/>
         
         
@@ -74,8 +74,8 @@
             <javac srcdir="@{sample-dir}/src"
                    destdir="@{sample-dir}/build/classes">
                 <classpath>
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
                     <pathelement location="${ui.jar}"/>
                     <pathelement path="${compile.classpath}"/>
                 </classpath>
@@ -93,7 +93,7 @@
                 <isset property="${packaged.libs}"/>
                 <then>
                     <echo message="Packing dependent libraries"/>
- <for list="${jsf-impl.jar},${jsf-api.jar},${packaged.libs}"
+ <for list="${javax.faces.jar},${javax.faces-api.jar},${packaged.libs}"
                          param="jar">
                         <sequential>
                             <jar destfile="${basedir}/@{sample-name}.war"
Index: jsf-demo/build.xml
===================================================================
--- jsf-demo/build.xml (revision 9221)
+++ jsf-demo/build.xml (working copy)
@@ -124,8 +124,8 @@
 
 
     <target name="copyJars" depends="prepare.dist">
- <copy file="${jsf-api.jar}" todir="${dist.home}/lib"/>
- <copy file="${jsf-impl.jar}" todir="${dist.home}/lib"/>
+ <copy file="${javax.faces-api.jar}" todir="${dist.home}/lib"/>
+ <copy file="${javax.faces.jar}" todir="${dist.home}/lib"/>
     </target>
 
     <!-- target for building standalone JSF distribution -->
@@ -144,12 +144,12 @@
 
         <echo>Creating Special JAR for GlassFish</echo>
         <mkdir dir="${basedir}/tmp"/>
- <jsf.manifested.jar jarfile="${basedir}/tmp/jsf-impl.jar"
+ <jsf.manifested.jar jarfile="${basedir}/tmp/javax.faces.jar"
                             basedir="${jsf.build.home}/jsf-ri/build/classes"
                             extension-name="com.sun.faces"/>
         <jar jarfile="glassfish-jsf-${impl.version}.jar">
- <fileset dir="${basedir}/tmp" includes="jsf-impl.jar"/>
- <fileset dir="${jsf.build.home}/jsf-api/build/lib" includes="jsf-api.jar"/>
+ <fileset dir="${basedir}/tmp" includes="javax.faces.jar"/>
+ <fileset dir="${jsf.build.home}/jsf-api/build/lib" includes="javax.faces-api.jar"/>
         </jar>
         <delete dir="${basedir}/tmp"/>
     </target>
Index: jsf-demo/build-tests.xml
===================================================================
--- jsf-demo/build-tests.xml (revision 9221)
+++ jsf-demo/build-tests.xml (working copy)
@@ -87,7 +87,7 @@
     <property name="appserver.domain" value="domain1"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
         <pathelement location="${build}/classes"/>
         <path refid="htmlunit.compile.classpath"/>
         <path refid="compile.classpath"/>
Index: jsf-demo/guessNumber/build.xml
===================================================================
--- jsf-demo/guessNumber/build.xml (revision 9221)
+++ jsf-demo/guessNumber/build.xml (working copy)
@@ -52,8 +52,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/${example}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/basic-ajax/build.xml
===================================================================
--- jsf-demo/basic-ajax/build.xml (revision 9221)
+++ jsf-demo/basic-ajax/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/helloworld/build.xml
===================================================================
--- jsf-demo/helloworld/build.xml (revision 9221)
+++ jsf-demo/helloworld/build.xml (working copy)
@@ -54,8 +54,8 @@
     <property name="lib" value="${basedir}/lib"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/basic-ezcomp/build.xml
===================================================================
--- jsf-demo/basic-ezcomp/build.xml (revision 9221)
+++ jsf-demo/basic-ezcomp/build.xml (working copy)
@@ -54,8 +54,8 @@
 
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: jsf-demo/ifnavigation/build.xml
===================================================================
--- jsf-demo/ifnavigation/build.xml (revision 9221)
+++ jsf-demo/ifnavigation/build.xml (working copy)
@@ -53,8 +53,8 @@
     <property name="build" value="${basedir}/build"/>
 
     <path id="classpath">
- <pathelement location="${jsf-api.jar}"/>
- <pathelement location="${jsf-impl.jar}"/>
+ <pathelement location="${javax.faces-api.jar}"/>
+ <pathelement location="${javax.faces.jar}"/>
         <pathelement location="${build}/WEB-INF/classes"/>
         <path refid="compile.classpath"/>
     </path>
Index: updatecenter2/build.xml
===================================================================
--- updatecenter2/build.xml (revision 9221)
+++ updatecenter2/build.xml (working copy)
@@ -53,10 +53,8 @@
     <!-- Create the distributed artifacts -->
     <target name="dist">
       <mkdir dir="dist/glassfish/modules/web"/>
- <copy file="lib/jsf-api.jar"
- tofile="dist/glassfish/modules/jsf-api.jar"/>
- <copy file="lib/jsf-impl.jar"
- tofile="dist/glassfish/modules/web/jsf-impl.jar"/>
+ <copy file="lib/javax.faces.jar"
+ tofile="dist/glassfish/modules/web/javax.faces.jar"/>
       <mkdir dir="dist/jsf2.1"/>
       <copy file="conf/LICENSE" todir="dist/jsf2.1"/>
       <copy file="conf/README" todir="dist/jsf2.1"/>
@@ -76,8 +74,7 @@
     </target>
 
     <target name="cleanall" depends="clean">
- <delete file="lib/jsf-api.jar"/>
- <delete file="lib/jsf-impl.jar"/>
+ <delete file="lib/javax.faces.jar"/>
     </target>
 
 </project>

-- 
| edward.burns_at_oracle.com | office: +1 407 458 0017
| homepage:               | http://ridingthecrest.com/