Minor changes

git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@554 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -28,14 +28,13 @@
     <!-- ======================================================================================= -->
 
     <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-        <classpath>
-            <pathelement location="${basedir}/build/lib/ant-contrib.jar"/>
-        </classpath>
+        <classpath><pathelement location="${basedir}/build/lib/ant-contrib.jar"/></classpath>
     </taskdef>
     <taskdef name="subdirinfo" classname="org.jivesoftware.ant.SubDirInfoTask">
-        <classpath>
-            <pathelement location="${basedir}/build/lib/ant-subdirtask.jar"/>
-        </classpath>
+        <classpath><pathelement location="${basedir}/build/lib/ant-subdirtask.jar"/></classpath>
+    </taskdef>
+    <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask">
+        <classpath><pathelement location="${basedir}/build/lib/xmltask.jar"/></classpath>
     </taskdef>
 
     <!--
@@ -615,7 +614,7 @@
     </target>
 
     <!-- plugins =============================================================================== -->
-    <target name="plugins">
+    <target name="plugins" description="Builds all plugins">
         <!-- Call jar task, can't do this is as a 'depends' call of this target because
              of the way class loading works for jspc calls.
         -->
@@ -728,6 +727,9 @@
                 webXml="${plugin.dev.dest.dir}/@{plugin}/target/jspc/web.xml"
             />
 
+            <!-- Use xmltask to merge the generated web.xml file and a developer one (if any) -->
+            
+
             <!-- Compile java classes -->
             <javac
                 destdir="${plugin.dev.dest.dir}/@{plugin}/target/jspc/classes"
@@ -805,4 +807,10 @@
         <delete dir="${test.classes.dest.dir}" />
     </target>
 
+    <!-- clean-plugins ========================================================================= -->
+    <target name="clean-plugins" description="Cleans all generated plugins">
+        <delete dir="${plugin.dest.dir}" />
+        <delete dir="${plugin.dev.dest.dir}" />
+    </target>
+
 </project>