Author: chris.laprun(a)jboss.com Date: 2008-06-17 17:53:04 -0400 (Tue, 17 Jun 2008) New Revision: 11066 Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml Log: - Re-formatting... Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2008-06-17 15:58:48 UTC (rev 11065) +++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2008-06-17 21:53:04 UTC (rev 11066) @@ -23,13 +23,13 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <!DOCTYPE project [ - <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> - ]> + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> + <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> + <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> + <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent"> + ]> <!-- $Id$ --> @@ -45,14 +45,7 @@ <project default="main" name="JBoss Portal"> - <!--+====================================================================+--> - <!--| Setup |--> - <!--| |--> - <!--| Include the common build elements. |--> - <!--| |--> - <!--| This defines several different targets, properties and paths. |--> - <!--| It also sets up the basic extention tasks amoung other things. |--> - <!--+====================================================================+--> + <!--+====================================================================+--><!--| Setup |--><!--| |--><!--| Include the common build elements. |--><!--| |--><!--| This defines several different targets, properties and paths. |--><!--| It also sets up the basic extention tasks amoung other things. |--><!--+====================================================================+--> &buildmagic; &modules; @@ -60,9 +53,7 @@ &tools; &targets; - <!-- ================================================================== --> - <!-- Initialization --> - <!-- ================================================================== --> + <!-- ================================================================== --><!-- Initialization --><!-- ================================================================== --> <!-- | Initialize the build system. Must depend on '_buildmagic:init'. @@ -72,12 +63,7 @@ <target name="init" unless="init.disable" depends="_buildmagic:init"> </target> - <!--+====================================================================+--> - <!--| Configuration |--> - <!--| |--> - <!--| This target is invoked by the Buildmagic initialization logic |--> - <!--| and should contain module specific configuration elements. |--> - <!--+====================================================================+--> + <!--+====================================================================+--><!--| Configuration |--><!--| |--><!--| This target is invoked by the Buildmagic initialization logic |--><!--| and should contain module specific configuration elements. |--><!--+====================================================================+--> <target name="configure" unless="configure.disable"> @@ -89,25 +75,24 @@ &libraries; <path id="library.classpath"> <path refid="jboss.portal/modules/common.classpath"/> - <path refid="apache.logging.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="beanshell.beanshell.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.collections.classpath"/> + <path refid="beanshell.beanshell.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="ehcache.ehcache.classpath"/> + <path refid="ehcache.ehcache.classpath"/> <path refid="junit.junit.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="asm.asm.classpath"/> - <path refid="cglib.cglib.classpath"/> - <path refid="antlr.antlr.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="sun.servlet.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="asm.asm.classpath"/> + <path refid="cglib.cglib.classpath"/> + <path refid="antlr.antlr.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="sun.servlet.classpath"/> <!-- jbpm integration --> - <path refid="jbpm.jaronly.classpath"/> + <path refid="jbpm.jaronly.classpath"/> </path> - - + <path id="javac.classpath"> <pathelement location="${build.classes}"/> </path> @@ -117,55 +102,45 @@ <!-- Configure modules --> <call target="configure-modules"/> <path id="dependentmodule.classpath"> - <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal/modules/identity.classpath"/> + <path refid="jboss.portal-jems.classpath"/> + <path refid="jboss.portal/modules/identity.classpath"/> </path> - <!--+=======================================+--> - <!--| Override any default properties here. |--> - <!--+=======================================+--> + <!--+=======================================+--><!--| Override any default properties here. |--><!--+=======================================+--> <!-- Configure defaults & build tools --> <call target="configure-defaults"/> <call target="configure-tools"/> - <!--+=======================================+--> - <!--| Define module specific elements here. |--> - <!--+=======================================+--> + <!--+=======================================+--><!--| Define module specific elements here. |--><!--+=======================================+--> <property name="javadoc.private" value="true"/> <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 name="configure-explode"> - <path id="explode.task.classpath"> - <pathelement location="${project.tools}/lib/explode.jar"/> - <path refid="apache.ant.classpath"/> - </path> - <taskdef - name="explode" + <taskdef name="explode" classname="org.jboss.portal.common.ant.Explode" classpathref="explode.task.classpath"/> - </target> + <taskdef name="implode" + classname="org.jboss.portal.common.ant.Implode" + classpathref="explode.task.classpath"/> - <!--+====================================================================+--> - <!--| Compile |--> - <!--| |--> - <!--| This target should depend on other compile-* targets for each |--> - <!--| different type of compile that needs to be performed, short of |--> - <!--| documentation compiles. |--> - <!--+====================================================================+--> + </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 |--><!--| |--><!--| This target should depend on other compile-* targets for each |--><!--| different type of compile that needs to be performed, short of |--><!--| documentation compiles. |--><!--+====================================================================+--> + <target name="compile" description="Compile all source files." depends="_default:compile-classes, @@ -174,22 +149,16 @@ <!-- Add module specific elements here. --> </target> - <!--+====================================================================+--> - <!--| Generate Output |--> - <!--| |--> - <!--| Generates the target output for this module. Target output is |--> - <!--| the output which is ment to be released or used by external |--> - <!--| modules. |--> - <!--+====================================================================+--> + <!--+====================================================================+--><!--| Generate Output |--><!--| |--><!--| Generates the target output for this module. Target output is |--><!--| the output which is ment to be released or used by external |--><!--| modules. |--><!--+====================================================================+--> <target name="output" description="Generate all target output." depends="compile"> - <mkdir dir="${build.lib}"/> - - <jar jarfile="${build.lib}/portal-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf"> + <mkdir dir="${build.lib}"/> + + <jar jarfile="${build.lib}/portal-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf"> <fileset dir="${build.classes}"/> - </jar> + </jar> <!-- <copy todir="${build.resources}/portal-workflow.war"> @@ -203,7 +172,7 @@ <!-- workflow service --> <copy todir="${build.resources}/portal-workflow.sar"> - <fileset dir="${build.resources}/portal-workflow-sar"/> + <fileset dir="${build.resources}/portal-workflow-sar"/> </copy> <!-- @@ -212,8 +181,8 @@ </copy> --> <implode - dir="${build.resources}/portal-workflow.sar" - tofile="${build.lib}/portal-workflow.sar"/> + dir="${build.resources}/portal-workflow.sar" + tofile="${build.lib}/portal-workflow.sar"/> </target> <target name="deploy" @@ -226,76 +195,66 @@ <!-- generates artifacts used for tests, requires output to be previously run --> - <target name="package-tests" depends="init"> - </target> - - <target name="deploy-tests" + <target name="package-tests" depends="init"> + </target> + + <target name="deploy-tests" description="Deploy." - depends="output"> - </target> - - <target name="undeploy-tests" + depends="output"> + </target> + + <target name="undeploy-tests" description="UnDeploy." - depends="output"> - </target> + depends="output"> + </target> - <!-- ================================================================== --> - <!-- Cleaning --> - <!-- ================================================================== --> + <!-- ================================================================== --><!-- Cleaning --><!-- ================================================================== --> <!-- Clean up all build output --> <target name="clean" depends="_default:clean"> <!-- Add module specific elements here. --> </target> - <!--+====================================================================+--> - <!--| Documents |--> - <!--| |--> - <!--| Generate all documentation for this module. |--> - <!--+====================================================================+--> + <!--+====================================================================+--><!--| Documents |--><!--| |--><!--| Generate all documentation for this module. |--><!--+====================================================================+--> <target name="docs" depends="_default:docs"> <!-- Add module specific elements here. --> </target> - <!-- ================================================================== --> - <!-- Misc. --> - <!-- ================================================================== --> + <!-- ================================================================== --><!-- Misc. --><!-- ================================================================== --> <target name="main" depends="most"/> <target name="all" depends="_default:all"/> <target name="most" depends="_default:most"/> <target name="help" depends="_default:help"/> - <!-- ================================================================== --> - <!-- Test. --> - <!-- ================================================================== --> + <!-- ================================================================== --><!-- Test. --><!-- ================================================================== --> <target name="tests" depends="init"> <execute-tests> - <x-test> - <!-- general jbpm unit tests --> + <x-test> + <!-- general jbpm unit tests --> <test todir="${test.reports}" name="org.jboss.portal.workflow.test.HelloWorldDbTest"/> <!-- cms workflow tests --> <test todir="${test.reports}" name="org.jboss.portal.workflow.test.PortalCMSPublish"/> </x-test> <x-classpath> - <path refid="apache.logging.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="beanshell.beanshell.classpath"/> - <path refid="hibernate.hibernate.classpath"/> - <path refid="ehcache.ehcache.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="asm.asm.classpath"/> - <path refid="cglib.cglib.classpath"/> - <path refid="antlr.antlr.classpath"/> - <path refid="jbossas/core.libs.classpath"/> + <path refid="apache.logging.classpath"/> + <path refid="apache.log4j.classpath"/> + <path refid="apache.collections.classpath"/> + <path refid="beanshell.beanshell.classpath"/> + <path refid="hibernate.hibernate.classpath"/> + <path refid="ehcache.ehcache.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="asm.asm.classpath"/> + <path refid="cglib.cglib.classpath"/> + <path refid="antlr.antlr.classpath"/> + <path refid="jbossas/core.libs.classpath"/> <!-- jbpm integration --> <path refid="jbpm.jaronly.classpath"/> - <pathelement location="${build.lib}/portal-workflow-lib.jar"/> - <pathelement location="${build.resources}/test"/> + <pathelement location="${build.lib}/portal-workflow-lib.jar"/> + <pathelement location="${build.resources}/test"/> </x-classpath> </execute-tests> </target>