[portal-commits] JBoss Portal SVN: r7740 - in branches/JBoss_Portal_Branch_2_6: core-wsrp and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2007-07-12 13:49:22 -0400 (Thu, 12 Jul 2007) New Revision: 7740 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml Log: Build fixes Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-12 17:29:22 UTC (rev 7739) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-07-12 17:49:22 UTC (rev 7740) @@ -229,6 +229,7 @@ <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> + <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> </copy> <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples"> <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> @@ -239,10 +240,6 @@ <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> </copy> - <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"> - <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> - </copy> </target> <!-- @@ -263,8 +260,9 @@ <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> + <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal-ha.sar/samples"> + <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/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/**"/> @@ -273,10 +271,6 @@ <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> </copy> - <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp-admin.sar"> - <fileset dir="${source.dir}/core-wsrp/output/resources" includes="portal-wsrp-admin.sar/**"/> - </copy> <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> </target> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-12 17:29:22 UTC (rev 7739) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-12 17:49:22 UTC (rev 7740) @@ -195,7 +195,7 @@ <fileset dir="${build.classes}"/> </jar> - <copy todir="${build.resources}/portal-wsrp-admin-war/WEB-INF/lib2"> + <copy todir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war/WEB-INF/lib2"> <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/> <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> @@ -203,19 +203,23 @@ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/> - </copy> + </copy> + <copy todir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war"> + <fileset dir="${build.resources}/portal-wsrp-admin-war" includes="**/*"/> + </copy> + <jar jarfile="${build.lib}/portal-wsrp-admin.war"> - <fileset dir="${build.resources}/portal-wsrp-admin-war"/> + <fileset dir="${build.resources}/portal-wsrp-admin.sar/portal-wsrp-admin.war"/> </jar> <!-- portal-wsrp-admin.sar --> - <copy todir="${build.resources}/portal-wsrp-admin-sar/"> + <copy todir="${build.resources}/portal-wsrp-admin.sar/"> <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/> </copy> <!-- portal-wsrp-admin.sar --> - <copy todir="${build.resources}/portal-wsrp-admin-sar/lib"> + <copy todir="${build.resources}/portal-wsrp-admin.sar/lib"> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> <!-- For JSF --> <fileset dir="${commons.el.lib}" includes="commons-el.jar"/> @@ -223,11 +227,6 @@ <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> </copy> - <!-- portal-wsrp-admin.sar --> - <copy todir="${build.resources}/portal-wsrp-admin-sar"> - <fileset dir="${build.lib}" includes="portal-wsrp-admin.war"/> - </copy> - <jar jarfile="${build.lib}/portal-wsrp-admin.sar"> <fileset dir="${build.resources}/portal-wsrp-admin-sar" includes="**/*"/> </jar>