jon         02/01/15 13:40:05

  Modified:    .        build.xml default.properties
  Log:
  elicia is having some weird compile errors where the DVSL service won't compile
  because of a dep on dom4j. so i'm going to try including it and see if
  it solves her problem.
  
  -jon
  
  Revision  Changes    Path
  1.40      +16 -1     jakarta-turbine-fulcrum/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- build.xml 1 Jan 2002 15:17:37 -0000       1.39
  +++ build.xml 15 Jan 2002 21:40:05 -0000      1.40
  @@ -30,6 +30,7 @@
       <pathelement location="${xmlrpc.jar}"/>
       <pathelement location="${dvsl.jar}"/>
       <pathelement location="${junit.jar}"/>
  +    <pathelement location="${dom4j.jar}" />
     </path>
   
     <!-- ================================================================== -->
  @@ -44,6 +45,7 @@
       <echo message="bsf.jar = ${bsf.jar}"/>
       <echo message="commons-collections.jar = ${commons-collections.jar}"/>
       <echo message="commons-util.jar = ${commons-util.jar}"/>
  +    <echo message="dom4j.jar = ${dom4j.jar}"/>
       <echo message="dvsl.jar = ${dvsl.jar}"/>
       <echo message="jaf.jar = ${jaf.jar}"/>
       <echo message="javamail.jar = ${javamail.jar}"/>
  @@ -181,6 +183,12 @@
         property="dvsl.present"
         classpathref="classpath"
       />
  +
  +    <available
  +      classname="org.dom4j.Document"
  +      property="dom4j.present"
  +      classpathref="classpath"
  +    />
     </target>
   
     <!-- ================================================================== -->
  @@ -286,6 +294,13 @@
       </antcall>
     </target>
   
  +  <target name="check.dom4j" unless="dom4j.present">
  +    <antcall target="property-warning">
  +      <param name="name" value="dom4j.jar"/>
  +      <param name="value" value="${dom4j.jar}"/>
  +    </antcall>
  +  </target>
  +
   <!--
     This is commented out because the inclusion of the .jar file is 
     conditional depending on whether or not it is in your path. This
  @@ -343,7 +358,7 @@
           check.velocity,check.log4j,check.torque,check.bsf,
           check.servlet,check.javamail,check.jaf,check.xerces,check.xalan,
           check.xmlrpc,check.commons-collections,check.commons-util,
  -        check.regexp,check.dvsl,
  +        check.regexp,check.dvsl,check.dom4j,
           include-email,om">
       
       <!-- We have some static files that should overwrite
  
  
  
  1.16      +1 -1      jakarta-turbine-fulcrum/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/default.properties,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- default.properties        24 Dec 2001 16:00:59 -0000      1.15
  +++ default.properties        15 Jan 2002 21:40:05 -0000      1.16
  @@ -60,7 +60,7 @@
   xmlrpc.jar = ${lib.repo}/xmlrpc.jar
   regexp.jar = ${lib.repo}/jakarta-regexp-1.3-dev.jar
   dvsl.jar = ${lib.repo}/dvsl-0.3.jar
  -dom4j.jar = ${lib.repo}/dom4j.jar
  +dom4j.jar = ${lib.repo}/dom4j-1.1.jar
   
   
   # -------------------------------------------------------------------
  
  
  

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

Reply via email to