[portal-commits] JBoss Portal SVN: r13042 - branches/JBoss_Portal_AS5_Deployer/build.
portal-commits at lists.jboss.org
portal-commits at lists.jboss.org
Mon Mar 16 18:29:50 EDT 2009
Author: mwringe
Date: 2009-03-16 18:29:50 -0400 (Mon, 16 Mar 2009)
New Revision: 13042
Modified:
branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
branches/JBoss_Portal_AS5_Deployer/build/build.xml
branches/JBoss_Portal_AS5_Deployer/build/distrib.xml
Log:
Fix build scripts to properly build and deploy the main JBoss Portal deployable.
Modified: branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-16 22:28:29 UTC (rev 13041)
+++ branches/JBoss_Portal_AS5_Deployer/build/build-thirdparty.xml 2009-03-16 22:29:50 UTC (rev 13042)
@@ -64,7 +64,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.2.4"/>
+ <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/deployer" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/metadata" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
Modified: branches/JBoss_Portal_AS5_Deployer/build/build.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/build.xml 2009-03-16 22:28:29 UTC (rev 13041)
+++ branches/JBoss_Portal_AS5_Deployer/build/build.xml 2009-03-16 22:29:50 UTC (rev 13042)
@@ -269,28 +269,32 @@
description="Deploy."
depends="main">
<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 todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal"
+ overwrite="true">
+ <fileset dir="../core/output/lib/jboss-portal"/>
+ </copy>
</target>
<target name="undeploy"
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/>
+ <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal"/>
</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 todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal" overwrite="true">
+ <fileset dir="../core/output/lib/jboss-portal"/>
+ </copy>
<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-identity/output/lib/portal-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
<copy file="../workflow/output/lib/portal-workflow.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-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"/>
@@ -306,7 +310,7 @@
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 dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal"/>
<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-identity.sar"/>
@@ -331,7 +335,7 @@
<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"/>
+ <fileset dir="../core/output/resources/jboss-portal"/>
</copy>
</target>
Modified: branches/JBoss_Portal_AS5_Deployer/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/build/distrib.xml 2009-03-16 22:28:29 UTC (rev 13041)
+++ branches/JBoss_Portal_AS5_Deployer/build/distrib.xml 2009-03-16 22:29:50 UTC (rev 13042)
@@ -168,7 +168,6 @@
</sequential>
</target>
-
<target name="package-ds">
<sequential>
<mkdir dir="${todir}"/>
@@ -201,7 +200,7 @@
</target>
- <!-- use -Dno-doc=true if you simply want jboss-portal.sar without licenses etc-->
+ <!-- use -Dno-doc=true if you simply want jboss-portal without licenses etc-->
<target name="package-bin" unless="no-doc">
<sequential>
<mkdir dir="${todir}"/>
@@ -284,17 +283,14 @@
| JBoss Portal binary distribution
-->
- <target name="package-normal" description="package jboss-portal.sar">
+ <target name="package-normal" description="package jboss-portal">
<mkdir dir="${portal.build.normal.bin}"/>
<antcall target="package-bin">
<param name="todir" value="${portal.build.normal.bin}"/>
</antcall>
- <copy todir="${portal.build.normal.bin}/jboss-portal/jboss-portal.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/>
+ <copy todir="${portal.build.normal.bin}/jboss-portal">
+ <fileset dir="${source.dir}/core/output/resources/jboss-portal"/>
</copy>
- <move todir="${portal.build.normal.bin}/jboss-portal/portal-core.war">
- <fileset dir="${portal.build.normal.bin}/jboss-portal/jboss-portal.sar/portal-core.war"/>
- </move>
<copy todir="${portal.build.normal.bin}/jboss-portal/portal-cms.sar">
<fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
</copy>
@@ -322,18 +318,18 @@
<!--
| JBoss Portal ha binaries distribution
-->
- <target name="package-ha" description="package jboss-portal-ha.sar">
+ <target name="package-ha" description="package jboss-portal-ha">
<mkdir dir="${portal.build.ha.bin}"/>
<antcall target="package-bin">
<param name="todir" value="${portal.build.ha.bin}"/>
</antcall>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
- <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha">
+ <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha"/>
</copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar">
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha/portal-cms.sar">
<fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/>
</copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha">
<fileset dir="${source.dir}/workflow/output/resources" includes="portal-workflow.sar/**"/>
<fileset dir="${source.dir}/widget/output/resources" includes="portal-widget.war/**"/>
<fileset dir="${source.dir}/widget/output/resources" includes="portal-widget-netvibes.war/**"/>
@@ -341,15 +337,15 @@
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
<fileset dir="${source.dir}/core-identity/output/resources" includes="portal-identity.sar/**"/>
</copy>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples">
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha/samples">
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-portlet-samples.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-users-samples.sar/**"/>
</copy>
- <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>
- <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar">
+ <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha/portal-wsrp.sar"/>
+ <copy todir="${portal.build.ha.bin}/jboss-portal-ha/portal-wsrp.sar">
<fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
</copy>
<copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/>
@@ -365,8 +361,8 @@
<antcall target="package-bundled">
<param name="todir" value="${portal.build.normal.bundled}"/>
</antcall>
- <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar">
- <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/>
+ <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal">
+ <fileset dir="${portal.build.normal.bin}/jboss-portal"/>
</copy>
<copy todir="${portal.build.normal.bundled}/server/default/deploy">
<fileset dir="${portal.build.normal.bin}/setup" includes="portal-hsqldb-ds.xml"/>
@@ -378,7 +374,9 @@
<exclude name="server/all"/>
</fileset>
</copy>
+
<copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${portal.build.normal.bundled}"/>
+ <!--
<antcall target="patch-log4j">
<param name="todir" value="${portal.build.normal.bundled}/server/default"/>
</antcall>
@@ -387,7 +385,7 @@
</antcall>
<antcall target="patch-run.bat">
<param name="todir" value="${portal.build.normal.bundled}"/>
- </antcall>
+ </antcall> -->
</target>
<!--
More information about the portal-commits
mailing list