jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hor...@apache.org
Subject cvs commit: jakarta-taglibs/standard build.xml
Date Thu, 29 Aug 2002 02:04:49 GMT
horwat      2002/08/28 19:04:49

  Modified:    standard build.xml
  Log:
  JSP 2.0 EL package renaming to avoid potential JSTL 1.0 conflict.
  
  Revision  Changes    Path
  1.20      +33 -11    jakarta-taglibs/standard/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-taglibs/standard/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	23 Jul 2002 17:11:14 -0000	1.19
  +++ build.xml	29 Aug 2002 02:04:49 -0000	1.20
  @@ -152,22 +152,44 @@
   
     <target name="jsp20el.build">
       <echo message="Building JSP 2.0 expression language."/>
  -    <mkdir dir="${build.dir}/${taglib.name}/jsp20el"/>
  -    <javac srcdir="${library.src}"
  -           destdir="${build.dir}/${taglib.name}/jsp20el"
  -	   classpath="${servlet23.jar}"
  +    <property name="jsp20el.build.dir"   value="${build.dir}/${taglib.name}/jsp20el"/>
  +    <property name="jsp20el.scratch.dir"   value="${build.dir}/${taglib.name}/jsp20el/scratch"/>
  +    <property name="jsp20el.package.dir"   value="org/apache/jasper/runtime/el"/>
  +
  +    <mkdir dir="${jsp20el.build.dir}"/>
  +    <mkdir dir="${jsp20el.scratch.dir}"/>
  +
  +    <copy todir="${jsp20el.scratch.dir}/${jsp20el.package.dir}">
  +        <fileset dir="${library.src}/org/apache/taglibs/standard/lang">
  +            <include name="jstl/*"/>
  +            <include name="jstl/parser/*"/>
  +            <include name="jstl/parser/jsp20/*"/>
  +            <include name="support/*"/>
  +        </fileset>
  +    </copy>
  +    <!-- rename packages and imports for JSP 2.0 -->
  +    <replace dir="${jsp20el.scratch.dir}/${jsp20el.package.dir}">
  +        <include name="**/*"/>
  +        <replacetoken>org.apache.taglibs.standard.lang</replacetoken>
  +        <replacevalue>org.apache.jasper.runtime.el</replacevalue>
  +    </replace>
  +
  +    <javac srcdir="${jsp20el.scratch.dir}"
  +           destdir="${jsp20el.build.dir}"
  +	   classpath="${servlet23.jar}:${build.library}"
   	   debug="on">
  -      <include name="org/apache/taglibs/standard/lang/jstl/*"/>
  -      <include name="org/apache/taglibs/standard/lang/jstl/parser/*"/>
  -      <exclude name="org/apache/taglibs/standard/lang/jstl/parser/ELParser.java"/>
  -      <include name="org/apache/taglibs/standard/lang/jstl/parser/jsp20/*"/>
  -      <include name="org/apache/taglibs/standard/lang/support/**"/>
  +      <include name="${jsp20el.package.dir}/jstl/*"/>
  +      <include name="${jsp20el.package.dir}/jstl/parser/*"/>
  +      <exclude name="${jsp20el.package.dir}/jstl/parser/ELParser.java"/>
  +      <include name="${jsp20el.package.dir}/jstl/parser/jsp20/*"/>
  +      <include name="${jsp20el.package.dir}/support/**"/>
       </javac>
  -    <copy todir="${build.dir}/${taglib.name}/jsp20el/org/apache/taglibs/standard/lang/jstl">
  -	<fileset dir="${library.src}/org/apache/taglibs/standard/lang/jstl">
  +    <copy todir="${jsp20el.build.dir}/${jsp20el.package.dir}/jstl">
  +	<fileset dir="${jsp20el.scratch.dir}/${jsp20el.package.dir}/jstl">
   	    <include name="**/*.properties"/>
   	</fileset>
       </copy>
  +    <delete dir="${jsp20el.scratch.dir}"/>
     </target>
   
     <target name="jsp20el.dist" depends="jsp20el.build">
  
  
  

--
To unsubscribe, e-mail:   <mailto:taglibs-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:taglibs-dev-help@jakarta.apache.org>


Mime
View raw message