r=jhook
Ryan Lubke wrote:
> SECTION: Modified Files
> ----------------------------
> M jsf-demo/standard/build.xml
> - Patch provided by y_kare (y_kare) 'AT' dev.java.net
> * copy the right properties files using correct
> ant semantics
>
> M jsf-tools/src/com/sun/faces/ant/TaglibGenTask.java
> M jsf-tools/src/com/sun/faces/generate/HtmlTaglib21Generator.java
> - fix issue pointed out by jhook.
> * build will fail if building in a directory containing the
> string "12". Instead of doing indexOf on the path,
> use the PropertyManager to obtain the JSP version
> and then set the generator class accordingly.
>
> A jsf-tools/src/com/sun/faces/generate/HtmlTaglib12Generator.java
> R jsf-tools/src/com/sun/faces/generate/HtmlTaglibGenerator.java
> - keep consistent with naming conventions
>
>
> SECTION: Diffs
> ----------------------------
> Index: jsf-demo/standard/build.xml
> ===================================================================
> RCS file: /cvs/javaserverfaces-sources/jsf-demo/standard/build.xml,v
> retrieving revision 1.11
> diff -u -r1.11 build.xml
> --- jsf-demo/standard/build.xml 14 Dec 2005 22:27:45 -0000 1.11
> +++ jsf-demo/standard/build.xml 14 Mar 2006 00:58:16 -0000
> @@ -95,9 +95,9 @@
> <include name="*.xml"/>
> </fileset>
> </copy>
> - <copy todir="${build}/${example}/WEB-INF/classes/${example}">
> - <fileset dir="web">
> - <include name="*properties"/>
> + <copy todir="${build}/${example}/WEB-INF/classes">
> + <fileset dir="src">
> + <include name="**/*properties"/>
> </fileset>
> </copy>
>
> Index: jsf-tools/src/com/sun/faces/ant/TaglibGenTask.java
> ===================================================================
> RCS file:
> /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/ant/TaglibGenTask.java,v
>
> retrieving revision 1.5
> diff -u -r1.5 TaglibGenTask.java
> --- jsf-tools/src/com/sun/faces/ant/TaglibGenTask.java 22 Aug 2005
> 22:12:14 -0000 1.5
> +++ jsf-tools/src/com/sun/faces/ant/TaglibGenTask.java 14 Mar 2006
> 00:58:17 -0000
> @@ -31,6 +31,8 @@
>
> import org.apache.tools.ant.BuildException;
>
> +import com.sun.faces.generate.PropertyManager;
> +
> /**
> * <p>Task to create a JSP tags.</p>
> */
> @@ -48,10 +50,18 @@
>
> public void execute() throws BuildException {
>
> - if (generatorConfig.indexOf("12") > -1) {
> + PropertyManager manager =
> PropertyManager.newInstance(generatorConfig);
> + String jspVersion =
> + manager.getProperty(PropertyManager.JSP_VERSION_PROPERTY);
> + System.out.println("Generating taglibs for JSP version " +
> jspVersion);
> + if ("2.1".equals(jspVersion)) {
> + setGeneratorClass(GENERATOR_21_CLASS);
> + } else if ("1.2".equals(jspVersion)) {
> setGeneratorClass(GENERATOR_12_CLASS);
> } else {
> - setGeneratorClass(GENERATOR_21_CLASS);
> + throw new BuildException("Unsupported JSP version '"
> + + jspVersion
> + + '\'');
> }
>
> super.execute();
> Index: jsf-tools/src/com/sun/faces/generate/HtmlTaglib21Generator.java
> ===================================================================
> RCS file:
> /cvs/javaserverfaces-sources/jsf-tools/src/com/sun/faces/generate/HtmlTaglib21Generator.java,v
>
> retrieving revision 1.3
> diff -u -r1.3 HtmlTaglib21Generator.java
> --- jsf-tools/src/com/sun/faces/generate/HtmlTaglib21Generator.java
> 22 Aug 2005 22:12:24 -0000 1.3
> +++ jsf-tools/src/com/sun/faces/generate/HtmlTaglib21Generator.java
> 14 Mar 2006 00:58:17 -0000
> @@ -32,7 +32,7 @@
> * This class generates tag handler class code that is specifc to the
> * "html_basic" package and JSP 2.1.
> */
> -public class HtmlTaglib21Generator extends HtmlTaglibGenerator {
> +public class HtmlTaglib21Generator extends HtmlTaglib12Generator {
>
>
> // ------------------------------------------------------------
> Constructors
>
>
> SECTION: New Files
> ----------------------------
> SEE ATTACHMENTS
>
>------------------------------------------------------------------------
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: dev-unsubscribe_at_javaserverfaces.dev.java.net
>For additional commands, e-mail: dev-help_at_javaserverfaces.dev.java.net
>
--
Jacob Hookom - Minneapolis
----------------------------
JSF-EG, JSF-RI, EL, Facelets