geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r354633 - in /geronimo/trunk: assemblies/j2ee-installer/maven.xml plugins/geronimo-izpack-plugin/plugin.jelly
Date Wed, 07 Dec 2005 00:28:24 GMT
Author: djencks
Date: Tue Dec  6 16:28:22 2005
New Revision: 354633

URL: http://svn.apache.org/viewcvs?rev=354633&view=rev
Log:
don't reuse the assemble namespace

Modified:
    geronimo/trunk/assemblies/j2ee-installer/maven.xml
    geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly

Modified: geronimo/trunk/assemblies/j2ee-installer/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/maven.xml?rev=354633&r1=354632&r2=354633&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/maven.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/maven.xml Tue Dec  6 16:28:22 2005
@@ -27,7 +27,7 @@
     <goal name="assemble:install">
         <attainGoal name="assemble:assemble-to-repo"/>
         <!-- build the izpack installer here -->
-        <attainGoal name="assemble:izpack-installer-build"/>
+        <attainGoal name="izpack:izpack-installer-build"/>
     </goal>
 
     <preGoal name="assemble:install">

Modified: geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly?rev=354633&r1=354632&r2=354633&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly (original)
+++ geronimo/trunk/plugins/geronimo-izpack-plugin/plugin.jelly Tue Dec  6 16:28:22 2005
@@ -25,7 +25,6 @@
     xmlns:define="jelly:define"
     xmlns:m="jelly:maven"
     xmlns:velocity="jelly:velocity"
-    xmlns:assemble="geronimo:assembly"
     >
     <!-- ================= -->
     <!-- Global Properties -->
@@ -34,13 +33,7 @@
     <!-- Determine what the top-level project root is -->
     <j:set var="project.root" value="${pom.parentBasedir().getParentFile().getCanonicalFile()}"/>
 
-    <!--
-    <define:taglib uri="geronimo:assembly">
-        <define:jellybean name="installConfig" className="org.apache.geronimo.plugin.assembly.LocalConfigInstaller"
method="execute"/>
-        <define:jellybean name="installConfigToRepo" className="org.apache.geronimo.plugin.assembly.RepoConfigInstaller"
method="execute"/>
-    </define:taglib>
-    -->
-    <goal name="assemble:izpack-prepare">
+    <goal name="izpack:izpack-prepare">
 	<echo>izpack-prepare is running</echo>
 
         <fileScanner var="installFiles">
@@ -144,7 +137,7 @@
     </goal>
 
 
-    <goal name="assemble:izpack-installer-build" prereqs="assemble:izpack-prepare" >
+    <goal name="izpack:izpack-installer-build" prereqs="izpack:izpack-prepare" >
         <echo>IZPack installer build is running.</echo>
         <echo>IZPack Version is ${izpack_version}</echo>
         <ant:java jar="${maven.repo.local}/izpack/jars/standalone-compiler-${izpack_version}.jar"



Mime
View raw message