Author: julien(a)jboss.com Date: 2008-03-06 11:26:41 -0500 (Thu, 06 Mar 2008) New Revision: 10233 Modified: modules/portlet/trunk/build/distrib/distrib.xml modules/portlet/trunk/pom.xml Log: bundle html doc in the samples so it is possible to link them from the simple portal Modified: modules/portlet/trunk/build/distrib/distrib.xml =================================================================== --- modules/portlet/trunk/build/distrib/distrib.xml 2008-03-06 15:43:05 UTC (rev 10232) +++ modules/portlet/trunk/build/distrib/distrib.xml 2008-03-06 16:26:41 UTC (rev 10233) @@ -142,12 +142,6 @@ <!-- | Internal tasks --> - <target name="__package-binary"> - <antcall target="__package-distrib"> - <param name="todir" value="${bin.dir}"/> - </antcall> - <antcall target="__package-bundled-binary"/> - </target> <target name="__package-standalone-binary" if="bin-alone"> <mkdir dir="${bin.dir}/lib"/> @@ -156,13 +150,24 @@ </copy> <copy todir="${bin.dir}/samples"> <fileset dir="${source.dir}/samples/target" includes="*.war"/> + <fileset dir="${source.dir}/docs/user-guide/target/docbook" includes="*.war"/> </copy> </target> + <target name="__package-binary"> + <antcall target="__package-distrib"> + <param name="todir" value="${bin.dir}"/> + </antcall> + <antcall target="__package-bundled-binary"/> + </target> + <target name="__package-bundled-binary" unless="bin-alone"> <copy todir="${samples.dir}"> <fileset dir="${source.dir}/samples/target" includes="*.war"/> </copy> + <copy + file="${source.dir}/docs/user-guide/target/attach/user-guide-en-US-${maven.version}-html.war" + tofile="${samples.dir}/jbosspc-docs.war"/> </target> <target name="__package-distrib"> Modified: modules/portlet/trunk/pom.xml =================================================================== --- modules/portlet/trunk/pom.xml 2008-03-06 15:43:05 UTC (rev 10232) +++ modules/portlet/trunk/pom.xml 2008-03-06 16:26:41 UTC (rev 10233) @@ -5,7 +5,7 @@ <artifactId>module-aggregator</artifactId> <packaging>pom</packaging> <name>JBoss Portal Portlet Module Aggregator</name> - <version>2.0.0-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <url>http://labs.jboss.com/jbossportal</url> <dependencies/>