gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: gump/project db-ojb.xml
Date Sun, 21 Nov 2004 14:35:26 GMT
brianm      2004/11/21 06:35:26

  Modified:    project  db-ojb.xml
  Log:
  Change torque dependency to be 3.0.X (bundled) as the torque ddl generation is deprecated
in favor of commons-sql generation. Torque 3.0 remains for backwards compatibility until ~release
1.2, but anything new should go against commons-sql
  
  Revision  Changes    Path
  1.34      +20 -7     gump/project/db-ojb.xml
  
  Index: db-ojb.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/db-ojb.xml,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- db-ojb.xml	17 Nov 2004 10:40:39 -0000	1.33
  +++ db-ojb.xml	21 Nov 2004 14:35:26 -0000	1.34
  @@ -71,8 +71,15 @@
       <depend project="picocontainer"/>
       <depend project="spring"/>
   
  -    <depend project="db-torque" />
  +    <!--
  +        disabled as we depend on a VERY old version which we bundle, and only 
  +        continue to depend on it for backward compatibility. Forward dev 
  +        should be against commons-sql
  +        <depend project="db-torque" />
  +    
       <depend project="db-torque-gen" />
  +    -->
  +    <depend project="ojb-torque"/>
       <depend project="jakarta-turbine-jcs" />
   
       <!-- needed by test sources -->
  @@ -135,8 +142,13 @@
       <depend project="picocontainer"/>
       <depend project="spring"/>
   
  -    <depend project="db-torque" />
  -    <depend project="db-torque-gen" />
  +    <!--
  +        disabled as we depend on a VERY old version which we bundle, and only 
  +        continue to depend on it for backward compatibility
  +        <depend project="db-torque" />
  +        <depend project="db-torque-gen" />
  +    -->
  +    <depend project="ojb-torque"/>
       <depend project="jakarta-turbine-jcs" />
   
       <!-- needed by test sources -->
  @@ -158,7 +170,8 @@
       <ant target="junit" />
   
       <depend project="db-ojb" inherit="all" />
  -    <depend project="db-torque-gen"/>
  +    <!-- <depend project="db-torque-gen"/> -->
  +    <depend project="ojb-torque"/>
       <work nested="target/classestest" />
   
       <nag from="Stefan Bodewig &lt;bodewig@apache.org&gt;"
  @@ -166,9 +179,9 @@
            subject="Test Failure - OJB" />
     </project>
   
  -  <!--project name="ojb-torque">
  +  <project name="ojb-torque">
       <jar name="lib/torque-3.0.2.jar" />
  -  </project-->
  +  </project>
   
     <project name="p6spy">
       <jar name="lib/p6spy.jar" />
  
  
  

Mime
View raw message