DPML Notify

[pneubauer AT netcompartner.com]

Author: pneubauer
Date: Sat Jan 29 14:47:02 2005
New Revision: 1627

Modified:
   development/laboratory/magic/spells/emma/emma-build.xml
   
development/laboratory/magic/spells/emma/etc/deliverables/templates/emma.template
Log:
more tweaking


Modified: development/laboratory/magic/spells/emma/emma-build.xml
==============================================================================
--- development/laboratory/magic/spells/emma/emma-build.xml     (original)
+++ development/laboratory/magic/spells/emma/emma-build.xml     Sat Jan 29 
14:47:02 2005
@@ -1,13 +1,23 @@
 <project name="dpml-magic-emma" default="install" basedir="." 
       xmlns:magic="antlib:net.dpml.magic">
 
-  <magic:import uri="artifact:template:dpml/magic/standard"/>
   <magic:import uri="artifact:template:dpml/magic/emma"/>
+  <magic:import uri="artifact:template:dpml/magic/standard"/>
        
-  <target name="init" depends="standard.init, emma.prepare">
-  </target>
-
-  <target name="build" depends="standard.build">
+  <target name="init" depends="standard.init">
   </target>
+       <target name="build" depends="standard.build, emma"
+               description="emma prepare task">
+         
+           <path id="run.classpath" >
+                       
+                       <fileset dir="target/classes">
+                       <include name="**/*.class"/>
+                       </fileset>
+                       </path>
+           <mkdir dir="target/coverage"/>
+           
+         </target>
+         
 
 </project>
\ No newline at end of file

Modified: 
development/laboratory/magic/spells/emma/etc/deliverables/templates/emma.template
==============================================================================
--- 
development/laboratory/magic/spells/emma/etc/deliverables/templates/emma.template
   (original)
+++ 
development/laboratory/magic/spells/emma/etc/deliverables/templates/emma.template
   Sat Jan 29 14:47:02 2005
@@ -21,17 +21,11 @@
 <project name="emma" 
     xmlns:magic="antlib:net.dpml.magic" >
 
-  <target name="prepare">
+  <magic:import uri="artifact:template:dpml/magic/standard"/>
+  <target name="emma" depends="prepare" description="the wrapped emma task">
   
-    <magic:plugin uri="@PLUGIN-URI@"/>
-    <path id="run.classpath" >
-               
-               <fileset dir="target/classes">
-               <include name="**/*.class"/>
-               </fileset>
-               </path>
-    <mkdir dir="target/coverage"/>
-    <emma 
+           <magic:plugin uri="@PLUGIN-URI@"/>
+   <emma 
       xmlns="plugin:dpml/magic/dpml-magic-emma" enabled="true"
       description="the wrapped emma code coverage ant task" >
              <instr instrpathref="run.classpath"