From: Jayashri Visvanathan <Jayashri.Visvanathan_at_Sun.COM>
Date: Thu, 19 May 2005 11:44:59 -0700

r=jayashri

Ryan Lubke wrote:

> SECTION: Modified Files
> ----------------------------
> M build.properties.jwsdp
> M build.properties.sample
> M build.properties.tomcat
> - add endorsed.dirs property to make setting of java.endorsed.dirs
> property a
> little more flexible
>
> M jsf-ri/build.xml
> - replaced hardcoded java.endorsed.dirs paths with endorsed.dirs
> property
> - updated the version information from 1.1 to 1.2
> - Moved the calls that updated the manifest with dependent library
> version
> information from the jars target to the dist target
>
> M jsf-tools/build.xml
> - replaced hardcoded java.endorsed.dirs paths with endorsed.dirs
> property
>
> SECTION: Diffs
> ----------------------------
> Index: build.properties.jwsdp
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/build.properties.jwsdp,v
> retrieving revision 1.2
> diff -u -r1.2 build.properties.jwsdp
> --- build.properties.jwsdp 8 Feb 2005 19:25:05 -0000 1.2
> +++ build.properties.jwsdp 19 May 2005 18:15:00 -0000
> @@ -37,8 +37,11 @@
> jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
> standard.jar=${tomcat.home}/jstl/lib/standard.jar
>
> +# ----- Endorsed Directory
> +java.endorsed.dirs=${tomcat.home}/jaxp/lib/endorsed
> +
> # ----- JAXP implementation JAR
> -xerces.jar=${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar
> +xerces.jar=${java.endorsed.dirs}/xercesImpl.jar
>
> # ----- Build Control Flags -----
>
> Index: build.properties.sample
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/build.properties.sample,v
> retrieving revision 1.3
> diff -u -r1.3 build.properties.sample
> --- build.properties.sample 8 Feb 2005 19:25:05 -0000 1.3
> +++ build.properties.sample 19 May 2005 18:15:00 -0000
> @@ -37,8 +37,11 @@
> jstl.jar=${tomcat.home}/jstl/lib/jstl.jar
> standard.jar=${tomcat.home}/jstl/lib/standard.jar
>
> +# ----- Endorsed Directory
> +endorsed.dirs=${tomcat.home}/jaxp/lib/endorsed
> +
> # ----- JAXP implementation JAR
> -xerces.jar=${tomcat.home}/jaxp/lib/endorsed/xercesImpl.jar
> +xerces.jar=${endorsed.dirs}/xercesImpl.jar
>
> # ----- Build Control Flags -----
>
> Index: build.properties.tomcat
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/build.properties.tomcat,v
> retrieving revision 1.2
> diff -u -r1.2 build.properties.tomcat
> --- build.properties.tomcat 8 Feb 2005 19:25:05 -0000 1.2
> +++ build.properties.tomcat 19 May 2005 18:15:00 -0000
> @@ -37,8 +37,11 @@
> jsp.jar=${tomcat.home}/common/lib/jsp-api.jar
> servlet.jar=${tomcat.home}/common/lib/servlet-api.jar
>
> +# ----- Endorsed Directory
> +endorsed.dirs=${tomcat.home}/common/endorsed
> +
> # ----- JAXP implementation JAR
> -xerces.jar=${tomcat.home}/common/endorsed/xercesImpl.jar
> +xerces.jar=${java.endorsed.dirs}/xercesImpl.jar
>
> # ----- DOM implementation JAR
> dom.jar.dir=${tomcat.home}/common/endorsed
> Index: jsf-ri/build.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-ri/build.xml,v
> retrieving revision 1.180
> diff -u -r1.180 build.xml
> --- jsf-ri/build.xml 19 May 2005 13:26:59 -0000 1.180
> +++ jsf-ri/build.xml 19 May 2005 18:15:01 -0000
> @@ -12,7 +12,7 @@
>
> <property name="Name" value="JavaServer Faces RI"/>
> <property name="name" value="jsf-impl"/>
> - <property name="version" value="1_1"/>
> + <property name="version" value="1_2"/>
>
> <!-- ************ Per user local properties
> ******************************* -->
>
> @@ -411,6 +411,24 @@
>
>
> <target name="dist" depends="jars" description="Build distribution
> files">
> +
> + <antcall target="get-update-manifest-info">
> + <param name="jar-name" value="commons-beanutils"/>
> + <param name="jar-file" value="${commons-beanutils.jar}"/>
> + </antcall>
> + <antcall target="get-update-manifest-info">
> + <param name="jar-name" value="commons-collections"/>
> + <param name="jar-file" value="${commons-collections.jar}"/>
> + </antcall>
> + <antcall target="get-update-manifest-info">
> + <param name="jar-name" value="commons-digester"/>
> + <param name="jar-file" value="${commons-digester.jar}"/>
> + </antcall>
> + <antcall target="get-update-manifest-info">
> + <param name="jar-name" value="commons-logging"/>
> + <param name="jar-file" value="${commons-logging.jar}"/>
> + </antcall>
> +
> <mkdir dir="${dist.home}"/>
>
> <antcall target="tlddocs"/>
> @@ -517,7 +535,7 @@
> basedir="${build.classes}" >
> <manifest>
> <attribute name="Specification-Title" value="JavaServer
> Faces"/>
> - <attribute name="Specification-Version" value="1.1"/>
> + <attribute name="Specification-Version" value="1.2"/>
> <attribute name="Implementation-Title" value="'${name}':
> ${Name}"/>
> <attribute name="Implementation-Version" value="${version}"/>
> <attribute name="Implementation-Vendor" value="Sun
> Microsystems, Inc."/>
> @@ -525,22 +543,6 @@
> <attribute name="Extension-Name" value="com.sun.faces"/>
> </manifest>
> </jar>
> - <antcall target="get-update-manifest-info">
> - <param name="jar-name" value="commons-beanutils"/>
> - <param name="jar-file" value="${commons-beanutils.jar}"/>
> - </antcall>
> - <antcall target="get-update-manifest-info">
> - <param name="jar-name" value="commons-collections"/>
> - <param name="jar-file" value="${commons-collections.jar}"/>
> - </antcall>
> - <antcall target="get-update-manifest-info">
> - <param name="jar-name" value="commons-digester"/>
> - <param name="jar-file" value="${commons-digester.jar}"/>
> - </antcall>
> - <antcall target="get-update-manifest-info">
> - <param name="jar-name" value="commons-logging"/>
> - <param name="jar-file" value="${commons-logging.jar}"/>
> - </antcall>
> </target>
>
> <target name="get-update-manifest-info">
> @@ -724,7 +726,6 @@
> depends="prepare.config,test.compile"
> description="Execute standalone JUnit tests on config subsystem">
>
> -<!-- PENDING return to running
> <echo message="Running com.sun.faces.config tests ..."/>
> <junit printSummary="no" fork="no"
> haltonfailure="yes" haltonerror="yes">
> @@ -738,7 +739,7 @@
> value="${build.home}"/>
>
> <sysproperty key="java.endorsed.dirs"
> - value="${tomcat.home}/jaxp/lib/endorsed"/>
> + value="${endorsed.dirs}"/>
>
> <sysproperty key="org.apache.commons.logging.Log"
> value="${log.impl}"/>
> @@ -757,7 +758,6 @@
>
> includes="com/sun/faces/config/ConfigureListenerTestCase.class"/>
> </batchtest>
> </junit>
> --->
> </target>
>
>
> Index: jsf-tools/build.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-tools/build.xml,v
> retrieving revision 1.43
> diff -u -r1.43 build.xml
> --- jsf-tools/build.xml 9 May 2005 22:12:21 -0000 1.43
> +++ jsf-tools/build.xml 19 May 2005 18:15:03 -0000
> @@ -181,7 +181,7 @@
>
> facesConfig="${build.temp}/standard-html-renderkit.xml"
> fork="true">
> <classpath refid="run.classpath" />
> - <sysproperty key="java.endorsed.dirs"
> value="${tomcat.home}/common/endorsed"/>
> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
> </generateComponents>
>
> </target>
> @@ -195,13 +195,12 @@
> <fileset dir="${basedir}/conf">
> <include name="TAG-*"/>
> </fileset>
> - </copy>
> - + </copy> <generateTaglib
> generatorConfig="${basedir}/conf/HtmlBasicTaglib21.properties"
>
> facesConfig="${build.temp}/standard-html-renderkit.xml"
> fork="true">
> <classpath refid="run.classpath" />
> - <sysproperty key="java.endorsed.dirs"
> value="${tomcat.home}/common/endorsed"/>
> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
> <jvmarg line="${debug.jvm.args}"/>
> </generateTaglib>
>
> @@ -357,7 +356,7 @@
>
> facesConfig="${build.temp}/standard-html-renderkit.xml"
> fork="true">
> <classpath refid="run.classpath" />
> - <sysproperty key="java.endorsed.dirs"
> value="${tomcat.home}/common/endorsed"/>
> + <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
> </generateRenderkitDocs>
>
> <touch file="${build.generate}/last-generation"/>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
> For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net
>