Author: thomas.heute(a)jboss.com Date: 2007-07-16 04:41:54 -0400 (Mon, 16 Jul 2007) New Revision: 7774 Modified: trunk/build/build.xml trunk/build/distrib.xml Log: Fix wsrp build, fix build/distrib.xml, fix build/build.xml, JBPORTAL-1579: Change of package for UserCounterListener Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2007-07-16 08:36:58 UTC (rev 7773) +++ trunk/build/build.xml 2007-07-16 08:41:54 UTC (rev 7774) @@ -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: trunk/build/distrib.xml =================================================================== --- trunk/build/distrib.xml 2007-07-16 08:36:58 UTC (rev 7773) +++ trunk/build/distrib.xml 2007-07-16 08:41:54 UTC (rev 7774) @@ -142,6 +142,16 @@ </sequential> </target> + <target name="package-samples"> + <sequential> + <mkdir dir="${todir}"/> + <copy todir="${todir}"> + <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar"/> + </copy> + <copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/> + </sequential> + </target> + <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc--> <target name="package-bin" unless="no-doc"> <sequential> @@ -229,7 +239,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/**"/> @@ -260,7 +269,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/**"/>