Author: julien(a)jboss.com Date: 2007-04-18 04:41:01 -0400 (Wed, 18 Apr 2007) New Revision: 6997 Modified: trunk/core-admin/build.xml trunk/widget/build.xml Log: build the widget.war both as exploded and normal Modified: trunk/core-admin/build.xml =================================================================== --- trunk/core-admin/build.xml 2007-04-18 08:40:28 UTC (rev 6996) +++ trunk/core-admin/build.xml 2007-04-18 08:41:01 UTC (rev 6997) @@ -205,7 +205,6 @@ <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> </copy> - <copy todir="${build.resources}/portal-admin.sar/portal-admin.war"> <fileset dir="${build.resources}/portal-admin-war"/> <fileset dir="${source.bin}/portal-admin-war"/> @@ -213,13 +212,12 @@ </target> - - <!-- Build the jboss-portal.sar --> <target name="output" depends="artifacts"> - <!-- Build archives --> + <implode dir="${build.resources}/portal-admin.sar" tofile="${build.lib}/portal-admin.sar"/> + </target> <!-- ================================================================== --> Modified: trunk/widget/build.xml =================================================================== --- trunk/widget/build.xml 2007-04-18 08:40:28 UTC (rev 6996) +++ trunk/widget/build.xml 2007-04-18 08:41:01 UTC (rev 6997) @@ -111,6 +111,7 @@ <!-- Configure defaults & build tools --> <call target="configure-defaults"/> <call target="configure-tools"/> + <call target="configure-explode"/> <!--+=======================================+--> <!--| Define module specific elements here. |--> @@ -120,6 +121,22 @@ </target> + <target name="configure-explode"> + + <path id="explode.task.classpath"> + <pathelement location="${project.tools}/lib/explode.jar"/> + <path refid="apache.ant.classpath"/> + </path> + + <taskdef name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> + <taskdef name="implode" + classname="org.jboss.portal.common.ant.Implode" + classpathref="explode.task.classpath"/> + + </target> + <!--+====================================================================+--> <!--| Compile |--> <!--| |--> @@ -144,7 +161,7 @@ <!--| modules. |--> <!--+====================================================================+--> - <target name="output" + <target name="artifacts" description="Generate all target output." depends="compile"> @@ -155,26 +172,26 @@ </jar> <!-- widget.war --> - <mkdir dir="${build.resources}/widget-war/WEB-INF/lib"/> - <copy todir="${build.resources}/widget-war/WEB-INF/lib"> + <copy todir="${build.resources}/widget.war"> + <fileset dir="${build.resources}/widget-war"/> + </copy> + <copy todir="${build.resources}/widget.war/WEB-INF/lib"> <fileset dir="${build.lib}" includes="widget-lib.jar"/> </copy> - <jar jarfile="${build.lib}/widget.war"> - <fileset dir="${build.resources}/widget-war"/> - </jar> - <!-- widget-invoker.sar --> -<!-- - <mkdir dir="${build.resources}/widget-invoker-sar/lib"/> - <copy todir="${build.resources}/widget-invoker-sar/lib"> - <fileset dir="${build.lib}" includes="widget-invoker-lib.jar"/> - </copy> - <jar jarfile="${build.lib}/widget-invoker.sar"> - <fileset dir="${build.resources}/widget-invoker-sar"/> - </jar> ---> </target> + + <target name="output" + description="Generate all target output." + depends="artifacts"> + + <implode + dir="${build.resources}/widget-war" + tofile="${build.lib}/widget.war"/> + + </target> + <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== -->