Author: bdaw Date: 2007-03-07 18:41:43 -0500 (Wed, 07 Mar 2007) New Revision: 6592 Modified: trunk/build/distrib.xml Log: correct packaging of portal-admin.sar Modified: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-03-07 22:59:39 UTC (rev 6591) +++ trunk/build/distrib.xml 2007-03-07 23:41:43 UTC (rev 6592) @@ -75,7 +75,8 @@ </target> <!-- Build JBoss Portal documentation --> - <target name="doc.build"> + <target name="doc.build"> <!-- Normal build --> + <ant dir="${source.dir}/build" antfile="build.xml"/> <ant dir="${source.dir}-docs/referenceGuide" antfile="build.xml"/> <ant dir="${source.dir}-docs/userGuide" antfile="build.xml"/> <ant dir="${source.dir}-docs/quickstartuser" antfile="build.xml"/> @@ -198,7 +199,7 @@ <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/> + <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> </copy> <!-- <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> @@ -225,7 +226,7 @@ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.war/**"/> + <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> </copy> <!-- <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>