[portal-commits] JBoss Portal SVN: r11879 - tags/JBoss_Portal_2_7_0_CR1/build.

Author: thomas.heute(a)jboss.com Date: 2008-09-11 07:23:03 -0400 (Thu, 11 Sep 2008) New Revision: 11879 Modified: tags/JBoss_Portal_2_7_0_CR1/build/build.xml tags/JBoss_Portal_2_7_0_CR1/build/distrib.xml Log: minor Modified: tags/JBoss_Portal_2_7_0_CR1/build/build.xml =================================================================== --- tags/JBoss_Portal_2_7_0_CR1/build/build.xml 2008-09-11 11:22:42 UTC (rev 11878) +++ tags/JBoss_Portal_2_7_0_CR1/build/build.xml 2008-09-11 11:23:03 UTC (rev 11879) @@ -340,13 +340,6 @@ <javadoc destdir="javadoc"> <classpath> <fileset dir="../thirdparty" includes="**/*.jar"/> - <fileset dir="../../common/thirdparty" includes="**/*.jar"/> - <fileset dir="../../common/tools/lib" includes="**/*.jar"/> - <fileset dir="../../identity/thirdparty" includes="**/*.jar"/> - <fileset dir="../../portlet/thirdparty" includes="**/*.jar"/> - <fileset dir="../../test/thirdparty" includes="**/*.jar"/> - <fileset dir="../../test/test" includes="**/*.jar"/> - <fileset dir="../../web/thirdparty" includes="**/*.jar"/> </classpath> <packageset dir="../server/src/main"> <exclude name="org/jboss/portal/test/**"/> @@ -406,56 +399,6 @@ <exclude name="org/jboss/portal/test/**"/> </packageset> - <!-- Common module --> - <packageset dir="../../common/common/src/main/java"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../common/mc/src/main/java"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../common/portal/src/main/java"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - - <!-- Identity module --> - <packageset dir="../../identity/identity/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../identity/sso/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - - <!-- Portlet module --> - <packageset dir="../../portlet/bridge/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../portlet/federation/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../portlet/jsr168api/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../portlet/management/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../portlet/portlet/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../../portlet/test/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - - <!-- Test module --> - <packageset dir="../../test/test/src/main"> - <exclude name="org/jboss/test/**"/> - </packageset> - - <!-- Web module --> - <packageset dir="../../web/web/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - - <link href="/tmp/2.6.2/portlet/build/javadoc" packagelistLoc="/tmp/2.6.2/portlet/build/javadoc"/> </javadoc> </target> Modified: tags/JBoss_Portal_2_7_0_CR1/build/distrib.xml =================================================================== --- tags/JBoss_Portal_2_7_0_CR1/build/distrib.xml 2008-09-11 11:22:42 UTC (rev 11878) +++ tags/JBoss_Portal_2_7_0_CR1/build/distrib.xml 2008-09-11 11:23:03 UTC (rev 11879) @@ -89,6 +89,38 @@ <!-- Build JBoss Portal --> <target name="build" depends="source.build"/> + <target name="javadoc"> + <delete dir="javadoc-bundle"/> + <mkdir dir="javadoc-bundle"/> + <mkdir dir="javadoc-bundle/core"/> + <mkdir dir="javadoc-bundle/core"/> + <copy todir="javadoc-bundle/core"> + <fileset dir="javadoc" includes="**/*"/> + </copy> + <mkdir dir="javadoc-bundle/cms"/> + <copy todir="javadoc-bundle/cms"> + <fileset dir="../../cms/target/site/apidocs" includes="**/*"/> + </copy> + <mkdir dir="javadoc-bundle/identity"/> + <copy todir="javadoc-bundle/identity"> + <fileset dir="../../identity/build/javadoc" includes="**/*"/> + </copy> + <mkdir dir="javadoc-bundle/web"/> + <copy todir="javadoc-bundle/web"> + <fileset dir="../../web/target/site/apidocs" includes="**/*"/> + </copy> + <mkdir dir="javadoc-bundle/common"/> + <copy todir="javadoc-bundle/common"> + <fileset dir="../../common/target/site/apidocs" includes="**/*"/> + </copy> + <mkdir dir="javadoc-bundle/portlet"/> + <copy todir="javadoc-bundle/portlet"> + <fileset dir="../../portlet/target/site/apidocs" includes="**/*"/> + </copy> + <zip destfile="javadoc-bundle/javadoc.zip"> + <zipfileset prefix="javadoc-jboss-portal" dir="javadoc-bundle"/> + </zip> + </target> <!--<macrodef name="package-doc"> <attribute name="todir"/> @@ -120,9 +152,9 @@ <copy todir="${todir}/userGuide"> <fileset dir="${docs.dir}/userGuide/target/docbook/publish/en-US"/> </copy> - <mkdir dir="${todir}/quickstartuser"/> - <copy todir="${todir}/quickstartuser"> - <fileset dir="${docs.dir}/quickstartuser/target/docbook/publish/en-US"/> + <mkdir dir="${todir}/quickstartGuide"/> + <copy todir="${todir}/quickstartGuide"> + <fileset dir="${docs.dir}/quickstartGuide/target/docbook/publish/en-US"/> </copy> </sequential> </target>