db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject cvs commit: db-torque/src/maven-plugin plugin.jelly
Date Sat, 04 Sep 2004 13:33:09 GMT
seade       2004/09/04 06:33:09

  Modified:    xdocs    changes.xml
               src/maven-plugin plugin.jelly
  Log:
  TRQS220: Torque maven plugin om zip goal doesn't work.
  Thanks to Dan Price for the patch.
  
  Revision  Changes    Path
  1.138     +4 -0      db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.137
  retrieving revision 1.138
  diff -u -r1.137 -r1.138
  --- changes.xml	4 Sep 2004 13:28:58 -0000	1.137
  +++ changes.xml	4 Sep 2004 13:33:09 -0000	1.138
  @@ -10,6 +10,10 @@
   
       <release version="3.2-alpha" date="in CVS">
         <action dev='seade' type='fix'>
  +        TRQS220: Torque maven plugin om zip goal doesn't work.  Thanks to Dan
  +        Price for the patch.
  +      </action>
  +      <action dev='seade' type='fix'>
           Changed the default property value for <code>torque.output.dir</code>

           from <code>maven.build.dest</code> to <code>maven.build.dir</code>.
           This means many of the generated files will now appear in the 
  
  
  
  1.12      +6 -5      db-torque/src/maven-plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/db-torque/src/maven-plugin/plugin.jelly,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- plugin.jelly	25 Aug 2004 01:02:22 -0000	1.11
  +++ plugin.jelly	4 Sep 2004 13:33:09 -0000	1.12
  @@ -553,7 +553,7 @@
       <j:set var="torque.internal.omzip.type" value="bin"/>
       <j:set var="torque.internal.omzip.pattern" value="base"/>
       <j:set var="torque.internal.omzip.files" value="class"/>
  -    <j:set var="torque.internal.omzip.dir" value="${torque.compile.build.dir}"/>
  +    <j:set var="torque.internal.omzip.dir" value="${torque.omzip.dir}"/>
       <attainGoal name="torque:om-zip-worker"/>
       <j:set var="torque.internal.omzip.pattern" value="extension"/>
       <attainGoal name="torque:om-zip-worker"/>
  @@ -563,12 +563,13 @@
     <goal
       name="torque:om-zip-worker">
   
  -    <j:if test="torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}">
  +    <property name="torque_internal_omzipworker_guard_name" value="torque.internal.omzip.${torque.internal.omzip.type}.${torque.internal.omzip.pattern}"/>
  +    <j:if test="${context.getVariable(torque_internal_omzipworker_guard_name) == 'true'}">
   
         <!-- Base files that typically aren't modified. -->
         <patternset id="torque.internal.omzip.pattern.base">
  -        <include name="${torque.internal.omzip.packagePath}/${torque.basePrefix}*.${torque.internal.omzip.files}"/>
  -        <include name="${torque.internal.omzip.packagePath}/map/*MapBuilder.${torque.internal.omzip.files}"/>
  +        <include name="${torque.internal.omzip.packagePath}/**/${torque.basePrefix}*.${torque.internal.omzip.files}"/>
  +        <include name="${torque.internal.omzip.packagePath}/map/**/*MapBuilder.${torque.internal.omzip.files}"/>
         </patternset>
   
         <!-- Extension files that typically are modified. -->
  
  
  

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


Mime
View raw message