Author: thomas.heute(a)jboss.com Date: 2007-07-16 04:36:58 -0400 (Mon, 16 Jul 2007) New Revision: 7773 Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml branches/JBoss_Portal_Branch_2_6/build/distrib.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_6/wsrp/build.xml Log: Fix wsrp/wsrp-admin build Fix build/distrib.xml and build/build.xml Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-16 08:09:12 UTC (rev 7772) +++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-07-16 08:36:58 UTC (rev 7773) @@ -144,7 +144,7 @@ <group name="portal"> <include - modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-wsrp, core-admin, core-cms, core-management, core-samples, widget"/> + modules="common, test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/> </group> <group name="cms"> Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 08:09:12 UTC (rev 7772) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-16 08:36:58 UTC (rev 7773) @@ -245,7 +245,6 @@ <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> - <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> </copy> <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> @@ -276,7 +275,6 @@ <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> - <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> </copy> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-16 08:09:12 UTC (rev 7772) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-16 08:36:58 UTC (rev 7773) @@ -271,6 +271,7 @@ <!-- Deployment --> <!-- ================================================================== --> + <!-- <target name="deploy" description="Deploy." depends="output"> <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy file="${build.lib}/portal-wsrp-admin.war" todir="${jboss.home}/server/${portal.deploy.dir}" @@ -286,7 +287,8 @@ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> <copy file="${build.lib}/portal-wsrp-admin.war" todir="${jboss.home}/server/${portal-ha.deploy.dir}" overwrite="true"/> - </target> + </target> + --> <!-- ================================================================== --> <!-- Tests --> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 08:09:12 UTC (rev 7772) +++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-16 08:36:58 UTC (rev 7773) @@ -276,9 +276,6 @@ <target name="output" description="Generate WSRP Service archive." depends="compile"> <mkdir dir="${build.lib}"/> - <!-- Build Admin GUI... --> - <ant antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="output"/> - <!-- --> <jar jarfile="${build.lib}/portal-wsrp-client.jar"> <fileset dir="${build.resources}/portal-wsrp-client-jar"/> @@ -296,6 +293,9 @@ <jar jarfile="${build.lib}/portal-wsrp.jse"> <fileset dir="${build.resources}/portal-wsrp-jse"/> </jar> + + <!-- Build Admin GUI... --> + <ant inheritAll="false" antfile="../core-wsrp/build.xml" output="output.log" dir="../core-wsrp" target="output"/> <copy todir="${build.resources}/portal-wsrp-sar" overwrite="true"> <fileset dir="${build.lib}" includes="portal-wsrp-client.jar"/> <fileset dir="${build.lib}" includes="portal-wsrp.jse"/>