svn commit: r396475 - /geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly

[dj...@apache.org]

Author: djencks
Date: Mon Apr 24 01:24:26 2006
New Revision: 396475

URL: http://svn.apache.org/viewcvs?rev=396475&view=rev
Log:
THIS IS A HACK.  Something seems to have started overwriting config.xml with the plain non-velocity transformed original.  This redoes the velocity transform as the last step before zipping.

Modified:
    geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly

Modified: geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly?rev=396475&r1=396474&r2=396475&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly (original)
+++ geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly Mon Apr 24 01:24:26 2006
@@ -242,6 +242,8 @@
         <attainGoal name="assemble:assemble-unpack"/>
         <attainGoal name="assemble:assemble-configurations"/>
         <attainGoal name="assemble:assemble-schemas"/>
+        <velocity:merge basedir="${geronimo.assembly.src}/var/config" template="config.xml"
+                        name="${geronimo.assembly.dest}/var/config/config.xml"/>
     </goal>
 
     <goal name="assemble:assemble-to-repo" prereqs="assemble:assemble-prepare"
@@ -252,6 +254,8 @@
         <attainGoal name="assemble:assemble-configurations-to-repo"/>
         <attainGoal name="assemble:assemble-installer-helpers"/>
         <attainGoal name="assemble:assemble-schemas"/>
+        <velocity:merge basedir="${geronimo.assembly.src}/var/config" template="config.xml"
+                        name="${geronimo.assembly.dest}/var/config/config.xml"/>
     </goal>
     <goal name="assemble:assemble-installer-helpers">
         <ant:copy todir="${geronimo.assembly.dest}/var/temp">