geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r396548 - in /geronimo/branches/1.1/plugins: geronimo-assembly-plugin/plugin.jelly geronimo-deployment-plugin/plugin.jelly
Date Mon, 24 Apr 2006 13:42:11 GMT
Author: kevan
Date: Mon Apr 24 06:42:09 2006
New Revision: 396548

URL: http://svn.apache.org/viewcvs?rev=396548&view=rev
Log:
Fix deployment plugin. Important that the velocityFilter 'execute'. Removed David Jencks work-around
from assembly plugin

Modified:
    geronimo/branches/1.1/plugins/geronimo-assembly-plugin/plugin.jelly
    geronimo/branches/1.1/plugins/geronimo-deployment-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=396548&r1=396547&r2=396548&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 06:42:09
2006
@@ -242,8 +242,6 @@
         <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"
@@ -254,8 +252,6 @@
         <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">

Modified: geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly?rev=396548&r1=396547&r2=396548&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly (original)
+++ geronimo/branches/1.1/plugins/geronimo-deployment-plugin/plugin.jelly Mon Apr 24 06:42:09
2006
@@ -51,7 +51,8 @@
             method="execute"/>
         <define:jellybean
             name="velocityFilter"
-            className="org.apache.geronimo.deployment.mavenplugin.VelocityFilter"/>
+            className="org.apache.geronimo.deployment.mavenplugin.VelocityFilter"
+            method="execute"/>
         <define:jellybean
             name="mergeWebXML"
             className="org.apache.geronimo.deployment.mavenplugin.MergeWebXML"
@@ -117,4 +118,4 @@
 
     </define:taglib>
 
-</project>
\ No newline at end of file
+</project>



Mime
View raw message