Author: julien(a)jboss.com Date: 2007-06-26 12:47:03 -0400 (Tue, 26 Jun 2007) New Revision: 7559 Removed: trunk/samples/src/main/org/jboss/samples/portlet/event/ trunk/samples/src/main/org/jboss/samples/portlet/jsp/ trunk/samples/src/main/org/jboss/samples/portlet/news/ trunk/samples/src/main/org/jboss/samples/portlet/weather/ Modified: trunk/build/build.xml trunk/build/distrib.xml Log: update distrib.xml with right samples Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-06-26 16:46:07 UTC (rev 7558) +++ trunk/build/build.xml 2007-06-26 16:47:03 UTC (rev 7559) @@ -127,7 +127,6 @@ <module name="bridge"/> <module name="cms"/> <module name="format"/> - <module name="samples"/> <module name="core"/> <module name="core-cms"/> <module name="core-management"/> @@ -144,7 +143,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, samples, registration, 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: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-06-26 16:46:07 UTC (rev 7558) +++ trunk/build/distrib.xml 2007-06-26 16:47:03 UTC (rev 7559) @@ -227,10 +227,14 @@ </copy> <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> - <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.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/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> + </copy> <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> @@ -253,10 +257,14 @@ </copy> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> - <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.sar/**"/> </copy> + <copy todir="${portal.build.normal.bin}/jboss-portal-ha.sar/samples"> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> + </copy> <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>