taylor      2004/12/03 15:22:30

  Modified:    .        maven.xml
  Log:
  bug in drop db script, cant use dot notation in variable names in a jelly test
  
  Revision  Changes    Path
  1.106     +3 -6      jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -r1.105 -r1.106
  --- maven.xml 3 Dec 2004 22:01:38 -0000       1.105
  +++ maven.xml 3 Dec 2004 23:22:30 -0000       1.106
  @@ -417,16 +417,13 @@
     </goal>
     
     <goal name="db.drop2">
  +     <j:set var='nodots' 
value="${org.apache.jetspeed.database.default.name}" />     
       <j:choose>
  -      <j:when test="${org.apache.jetspeed.database.default.name == 'mssql'}" 
>               
  +      <j:when test="${nodots == 'mysql'}" >          
             <j:set var="database.arg.script" value="./src/sql/mssql/drop.sql" 
/>
             <attainGoal name="db.execute" />             
         </j:when>      
  -      <j:when test="${org.apache.jetspeed.database.default.name == 
'oracle'}" >              
  -          <j:set var="database.arg.script" value="./src/sql/oracle/drop.sql" 
/>
  -          <attainGoal name="db.execute" />             
  -      </j:when>                
  -       </j:choose>
  +     </j:choose>
     </goal>
   
     <goal name="db.drop.oracle">
  
  
  

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

Reply via email to