Author: thomas.heute(a)jboss.com Date: 2007-09-06 11:41:56 -0400 (Thu, 06 Sep 2007) New Revision: 8191 Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml branches/JBoss_Portal_Branch_2_6/workflow/build.xml Log: Fix workflow build and add it to the distribution Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-06 13:51:45 UTC (rev 8190) +++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-09-06 15:41:56 UTC (rev 8191) @@ -247,7 +247,8 @@ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/> </copy> <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> + <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}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> </copy> @@ -277,7 +278,8 @@ <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/> </copy> <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> - <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> + <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}/core-management/output/resources" includes="portal-management.sar/**"/> <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> </copy> Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-09-06 13:51:45 UTC (rev 8190) +++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2007-09-06 15:41:56 UTC (rev 8191) @@ -134,10 +134,30 @@ <!--| Define module specific elements here. |--> <!--+=======================================+--> <property name="javadoc.private" value="true"/> - <property name="javadoc.protected" value="false"/> + <property name="javadoc.protected" value="false"/> + + <taskdef name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> + + <taskdef name="implode" + classname="org.jboss.portal.common.ant.Implode" + classpathref="explode.task.classpath"/> - </target> + </target> + + <target name="configure-explode"> + <path id="explode.task.classpath"> + <pathelement location="${project.tools}/lib/explode.jar"/> + <path refid="apache.ant.classpath"/> + </path> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> + </target> + <!--+====================================================================+--> <!--| Compile |--> <!--| |--> @@ -168,32 +188,30 @@ <mkdir dir="${build.lib}"/> <jar jarfile="${build.lib}/portal-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf"> - <fileset dir="${build.classes}"/> - <!--fileset dir="${build.resources}/portal-workflow-jar"/--> + <fileset dir="${build.classes}"/> </jar> - <copy todir="${build.lib}/portal-workflow-war"> + <copy todir="${build.resources}/portal-workflow.war"> <fileset dir="${build.resources}/portal-workflow-war"/> </copy> <jar jarfile="${build.lib}/portal-workflow.war"> - <fileset dir="${build.lib}/portal-workflow-war"/> + <fileset dir="${build.resources}/portal-workflow.war"/> </jar> <!-- workflow service --> - <copy todir="${build.lib}/portal-workflow-sar"> -<!-- - <fileset dir="${jboss.portal-workflow.root}/lib" includes="portal-workflow-lib.jar, portal-workflow.war"/> - <fileset dir="${jbpm.jaronly.lib}" includes="jbpm.jar"/> - <fileset dir="${jbpm.jaronly.lib}" includes="jbpm-identity.jar"/> ---> - <fileset dir="${jboss.portal-workflow.root}/resources/portal-workflow-sar"/> + <copy todir="${build.resources}/portal-workflow.sar"> + <fileset dir="${build.resources}/portal-workflow-sar"/> </copy> - - <jar jarfile="${build.lib}/portal-workflow.sar"> - <fileset dir="${build.lib}/portal-workflow-sar"/> - </jar> + <!-- workflow service --> + <copy todir="${build.resources}/portal-workflow.sar/portal-worflow.war"> + <fileset dir="${build.resources}/portal-workflow.war"/> + </copy> + + <implode + dir="${build.resources}/portal-workflow.sar" + tofile="${build.lib}/portal-workflow.sar"/> </target> <target name="deploy"