You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/02/07 15:17:43 UTC

cvs commit: jakarta-turbine-torque build.xml deps.list

mpoeschl    02/02/07 06:17:43

  Modified:    .        build.xml deps.list
  Log:
  deps.list doesn't include the stratum jar.
  Build.xml also needs to be modified as well (checks for
  properties and packaging of stratum.jar in the zip distribution)
  pete@kazmier.com
  
  Revision  Changes    Path
  1.35      +18 -1     jakarta-turbine-torque/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/build.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- build.xml	6 Feb 2002 17:45:24 -0000	1.34
  +++ build.xml	7 Feb 2002 14:17:43 -0000	1.35
  @@ -147,6 +147,12 @@
       />
   
       <available
  +      classname="org.apache.stratum.configuration.Configuration"
  +      property="stratum.present"
  +      classpathref="classpath"
  +    />
  +
  +    <available
         classname="javax.sql.ConnectionPoolDataSource"
         property="jdbc.present"
         classpathref="classpath"
  @@ -237,6 +243,16 @@
     </target>
   
     <target
  +    name="check.stratum"
  +    unless="stratum.present">
  +
  +    <antcall target="property-warning">
  +      <param name="name" value="stratum.jar"/>
  +      <param name="value" value="${stratum.jar}"/>
  +    </antcall>
  +  </target>
  +
  +  <target
       name="check.jdbc"
       unless="jdbc.present">
   
  @@ -272,7 +288,7 @@
       name="prepare"
       depends="init,check.velocity,check.xerces,check.village,
                check.log4j,check.commons-collections,check.commons-util,
  -             check.jdbc,env">
  +             check.stratum,check.jdbc,env">
   
       <mkdir dir="${build.dir}"/>
       <mkdir dir="${build.dest}"/>
  @@ -560,6 +576,7 @@
       <copy file="${log4j.jar}" todir="${torque.dir}/lib"/>
       <copy file="${commons-collections.jar}" todir="${torque.dir}/lib"/>
       <copy file="${commons-util.jar}" todir="${torque.dir}/lib"/>
  +    <copy file="${stratum.jar}" todir="${torque.dir}/lib"/>
       <copy file="${jdbc.jar}" todir="${torque.dir}/lib"/>
   
       <filter token="TORQUE_HOME" value="."/>
  
  
  
  1.4       +1 -0      jakarta-turbine-torque/deps.list
  
  Index: deps.list
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/deps.list,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- deps.list	2 Feb 2002 17:17:19 -0000	1.3
  +++ deps.list	7 Feb 2002 14:17:43 -0000	1.4
  @@ -3,6 +3,7 @@
   jdbc2_0-stdext.jar
   junit-3.7.jar
   log4j-1.1.3.jar
  +stratum-0.1-dev.jar
   velocity-1.3-dev.jar
   village-1.5.3-dev.jar
   xercesImpl-2.0.0.jar
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>