Author: thomas.heute(a)jboss.com Date: 2008-07-29 14:39:04 -0400 (Tue, 29 Jul 2008) New Revision: 11630 Modified: tags/JBoss_Portal_2_7_BETA1/build/distrib.xml tags/JBoss_Portal_2_7_BETA1/server/src/main/org/jboss/portal/server/PortalConstants.java Log: minor Modified: tags/JBoss_Portal_2_7_BETA1/build/distrib.xml =================================================================== --- tags/JBoss_Portal_2_7_BETA1/build/distrib.xml 2008-07-29 18:36:55 UTC (rev 11629) +++ tags/JBoss_Portal_2_7_BETA1/build/distrib.xml 2008-07-29 18:39:04 UTC (rev 11630) @@ -1,8 +1,9 @@ <project default="main" name="JBoss Portal"> - <property name="source.dir" value="../../jboss-portal-2.6"/> - <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6.SNAPSHOT"/> + <property name="source.dir" value=".."/> + <property name="docs.dir" value="${source.dir}/../doc"/> + <property name="examples.dir" value="${source.dir}/../examples"/> + <property name="release.version" value="2.7.B1"/> <!-- --> <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> @@ -85,15 +86,8 @@ <ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/> </target> - <!-- Build JBoss Portal documentation --> - <target name="doc.build" depends="_normal.build" unless="no-doc"> - <ant dir="${docs.dir}/referenceGuide" antfile="build.xml"/> - <ant dir="${docs.dir}/userGuide" antfile="build.xml"/> - <ant dir="${docs.dir}/quickstartuser" antfile="build.xml"/> - </target> - <!-- Build JBoss Portal --> - <target name="build" depends="source.build,doc.build"/> + <target name="build" depends="source.build"/> <!--<macrodef name="package-doc"> @@ -120,19 +114,29 @@ <mkdir dir="${todir}"/> <mkdir dir="${todir}/referenceGuide"/> <copy todir="${todir}/referenceGuide"> - <fileset dir="${docs.dir}/referenceGuide/build/en/"/> + <fileset dir="${docs.dir}/referenceGuide/target/docbook/publish/en-US"/> </copy> <mkdir dir="${todir}/userGuide"/> <copy todir="${todir}/userGuide"> - <fileset dir="${docs.dir}/userGuide/build/en/"/> + <fileset dir="${docs.dir}/userGuide/target/docbook/publish/en-US"/> </copy> <mkdir dir="${todir}/quickstartuser"/> <copy todir="${todir}/quickstartuser"> - <fileset dir="${docs.dir}/quickstartuser/build/en/"/> + <fileset dir="${docs.dir}/quickstartuser/target/docbook/publish/en-US"/> </copy> </sequential> </target> + <target name="package-examples"> + <sequential> + <mkdir dir="${todir}"/> + <copy todir="${todir}"> + <fileset dir="${examples.dir}"/> + </copy> + </sequential> + </target> + + <target name="package-ds"> <sequential> <mkdir dir="${todir}"/> @@ -173,7 +177,10 @@ </antcall> <antcall target="package-samples"> <param name="todir" value="${todir}/samples"/> - </antcall> + </antcall> + <antcall target="package-examples"/> + <param name="todir" value="${todir}/examples"/> + </antcall> <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> <copy todir="${todir}/docs/portal/licenses"> <fileset dir="output/docs/licenses"/> @@ -193,6 +200,9 @@ <antcall target="package-samples"> <param name="todir" value="${todir}/samples"/> </antcall> + <antcall target="package-examples"/> + <param name="todir" value="${todir}/examples"/> + </antcall> <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> <copy todir="${todir}/docs/portal/licenses"> <fileset dir="output/docs/licenses"/> Modified: tags/JBoss_Portal_2_7_BETA1/server/src/main/org/jboss/portal/server/PortalConstants.java =================================================================== --- tags/JBoss_Portal_2_7_BETA1/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-07-29 18:36:55 UTC (rev 11629) +++ tags/JBoss_Portal_2_7_BETA1/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-07-29 18:39:04 UTC (rev 11630) @@ -36,7 +36,7 @@ { /** Current version. */ - public static final Version VERSION = new Version("JBoss Portal", 2, 7, 0, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Community"); + public static final Version VERSION = new Version("JBoss Portal", 2, 7, 0, new Version.Qualifier(Version.Qualifier.Prefix.BETA, Version.Qualifier.Suffix.SUFFIX_1), "Community"); /** The default portal name. */ public static final String DEFAULT_PORTAL_NAME = "default";