craigmcc    2003/08/09 18:21:43

  Modified:    contrib/struts-el build.xml
  Log:
  Modify the build.xml for struts-el to have a hard-coded reference to the
  struts.jar in the parent Struts source tree (i.e. output of "ant dist").
  This makes it possible to compile struts-el even when the user has a
  "${user.home}/build.properties" file that defines a struts.jar property
  (as I do, because I *use* Struts in lots of different packages).
  
  Revision  Changes    Path
  1.18      +3 -3      jakarta-struts/contrib/struts-el/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml 9 Aug 2003 19:29:30 -0000       1.17
  +++ build.xml 10 Aug 2003 01:21:43 -0000      1.18
  @@ -158,7 +158,7 @@
     <pathelement location="${commons-validator.jar}"/>
     <pathelement location="${jdbc20ext.jar}"/>
     <pathelement location="${servlet.jar}"/>
  -  <pathelement location="${struts.jar}"/>
  +  <pathelement location="../../dist/lib/struts.jar"/>
     <pathelement location="${struts-el.jar}"/>
     <pathelement location="${jstl.jar}"/>
     <pathelement location="${jstl-standard.jar}"/>
  @@ -193,7 +193,7 @@
    <target name="prepare.library" depends="init">
     <mkdir dir="${build.home}/library/classes/META-INF"/>
     <mkdir dir="${build.home}/library/classes/META-INF/tlds"/>
  -  <copy file="${struts.jar}" tofile="${build.home}/library/struts.jar"/>
  +  <copy file="../../dist/lib/struts.jar" tofile="${build.home}/library/struts.jar"/>
     <copy file="${jstl.jar}" tofile="${build.home}/library/jstl.jar"/>
     <copy file="${jstl-standard.jar}"
           tofile="${build.home}/library/standard.jar"/>
  @@ -277,7 +277,7 @@
     <mkdir dir="${build.home}/documentation/api"/>
     <javadoc sourcepath="${src.share.dir}"
              destdir="${build.home}/documentation/api"
  -           
classpath="${servlet.jar}:${jdbc20ext.jar}:${struts.jar}:${jstl.jar}:${jstl-standard.jar}"
  +           
classpath="${servlet.jar}:${jdbc20ext.jar}:../../dist/lib/struts.jar:${jstl.jar}:${jstl-standard.jar}"
              packagenames="org.apache.strutsel.*" author="true" private="true"
              use="true"
              version="true"
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to