You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ks...@apache.org on 2001/07/27 00:51:13 UTC

cvs commit: jakarta-turbine-torque/build build.properties.sample build.xml

kschrader    01/07/26 15:51:13

  Modified:    build    build.properties.sample build.xml
  Log:
  Updating the build to check for log4j
  
  Revision  Changes    Path
  1.2       +1 -0      jakarta-turbine-torque/build/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/build/build.properties.sample,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.properties.sample	2001/07/20 21:11:45	1.1
  +++ build.properties.sample	2001/07/26 22:51:13	1.2
  @@ -28,3 +28,4 @@
   # velocity.jar = ${lib.repo}/velocity-1.2-dev.jar
   # xerces.jar = ${lib.repo}/xerces-1.3.0.jar
   # village.jar = ${lib.repo}/village-1.5.1.jar
  +# log4j.jar = ${lib.repo}/log4j-1.1.jar
  
  
  
  1.7       +15 -1     jakarta-turbine-torque/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/build/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml	2001/07/26 19:21:33	1.6
  +++ build.xml	2001/07/26 22:51:13	1.7
  @@ -38,6 +38,7 @@
       <echo message="village.jar = ${village.jar}"/>
       <echo message="velocity.jar = ${velocity.jar}"/>
       <echo message="xerces.jar = ${xerces.jar}"/>
  +    <echo message="log4j.jar = ${log4j.jar}"/>
       <echo message=""/>
     </target>
   
  @@ -77,6 +78,12 @@
         property="village.present"
         classpathref="classpath"
       />
  +
  +    <available
  +      classname="org.apache.log4j.Category" 
  +      property="log4j.present"
  +      classpathref="classpath"
  +    />
     </target>
   
     <!-- ================================================================== -->
  @@ -104,6 +111,13 @@
       </antcall>
     </target>
   
  +  <target name="check.log4j" unless="log4j.present">
  +    <antcall target="property-warning">
  +      <param name="name" value="log4j.jar"/>
  +      <param name="value" value="${log4j.jar}"/>
  +    </antcall>
  +  </target>
  +
     <target name="property-warning">
       <echo>
         +----------------------------------------------------------------+
  @@ -127,7 +141,7 @@
     <!-- ================================================================== -->
     
     <target name="prepare" 
  -    depends="init,check.velocity,check.xerces,env">
  +    depends="init,check.velocity,check.xerces,check.log4j,env">
       
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.dest}"/>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org