Author: chris.laprun(a)jboss.com Date: 2008-06-20 12:56:15 -0400 (Fri, 20 Jun 2008) New Revision: 11099 Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/build/build-thirdparty.xml modules/test/branches/JBP_TEST_BRANCH_1_0/build/build.xml modules/test/branches/JBP_TEST_BRANCH_1_0/test/build.xml modules/test/branches/JBP_TEST_BRANCH_1_0/tools/build.xml Log: - Updated common to 1.2.0 - Cleaned up build files somewhat. Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/build/build-thirdparty.xml =================================================================== --- modules/test/branches/JBP_TEST_BRANCH_1_0/build/build-thirdparty.xml 2008-06-20 06:23:41 UTC (rev 11098) +++ modules/test/branches/JBP_TEST_BRANCH_1_0/build/build-thirdparty.xml 2008-06-20 16:56:15 UTC (rev 11099) @@ -47,7 +47,7 @@ are pushed to the http://repository.jboss.com site. --> - <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/> + <componentref name="jboss-portal/modules/common" version="1.2.0"/> <componentref name="codehaus/cargo" version="0.9"/> Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/build/build.xml =================================================================== --- modules/test/branches/JBP_TEST_BRANCH_1_0/build/build.xml 2008-06-20 06:23:41 UTC (rev 11098) +++ modules/test/branches/JBP_TEST_BRANCH_1_0/build/build.xml 2008-06-20 16:56:15 UTC (rev 11099) @@ -61,7 +61,7 @@ <property name="version.major" value="1"/> <property name="version.minor" value="0"/> - <property name="version.revision" value="0"/> + <property name="version.revision" value="2"/> <property name="version.tag" value="GA"/> <property name="version.name" value=""/> @@ -116,8 +116,7 @@ <!-- Module groups --> <group name="test"> - <include - modules="test"/> + <include modules="test"/> </group> <group name="default"> @@ -251,51 +250,6 @@ <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> </target> - <target name="deploy-all" - description="Deploy all archives." - depends="most"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-admin/output/lib//portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <!--<copy file="../core-search/output/lib/portal-search.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>--> - <copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - </target> - - <target name="undeploy-all" - description="Undeploy all archives." - depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cms.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-management.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/> - <!--<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-search.sar"/>--> - <delete file="${jboss.home}/server/${portal.deploy.dir}/widget.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/> - </target> - - <target name="exploded-deploy" - description="Deploy exploded sar." - depends="main"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> - <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"> - <fileset dir="../core/output/resources/jboss-portal.sar"/> - </copy> - </target> - <target name="javadoc"> <mkdir dir="javadoc"/> <javadoc destdir="javadoc"> Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/test/build.xml =================================================================== --- modules/test/branches/JBP_TEST_BRANCH_1_0/test/build.xml 2008-06-20 06:23:41 UTC (rev 11098) +++ modules/test/branches/JBP_TEST_BRANCH_1_0/test/build.xml 2008-06-20 16:56:15 UTC (rev 11099) @@ -43,7 +43,7 @@ <!--| Buildmagic extentions. |--> <!--+======================================================================+--> -<project default="main" name="JBoss Portal"> +<project default="main" name="JBoss Portal Test"> <!--+====================================================================+--> <!--| Setup |--> Modified: modules/test/branches/JBP_TEST_BRANCH_1_0/tools/build.xml =================================================================== --- modules/test/branches/JBP_TEST_BRANCH_1_0/tools/build.xml 2008-06-20 06:23:41 UTC (rev 11098) +++ modules/test/branches/JBP_TEST_BRANCH_1_0/tools/build.xml 2008-06-20 16:56:15 UTC (rev 11099) @@ -20,7 +20,7 @@ <!--| Buildmagic extentions. |--> <!--+======================================================================+--> -<project default="main" name="JBoss Portal"> +<project default="main" name="JBoss Portal Test Tools"> <!--+====================================================================+--> <!--| Setup |-->