[portal-commits] JBoss Portal SVN: r12464 - branches/JBoss_Portal_Branch_2_7/core-identity.

Author: chris.laprun(a)jboss.com Date: 2009-01-10 15:58:49 -0500 (Sat, 10 Jan 2009) New Revision: 12464 Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml Log: - reformat... Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2009-01-10 14:18:39 UTC (rev 12463) +++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2009-01-10 20:58:49 UTC (rev 12464) @@ -66,8 +66,8 @@ | Initialize the build system. Must depend on '_buildmagic:init'. | Other targets should depend on 'init' or things will mysteriously fail. --> - <import file="../testsuite/imports/server-config.xml"/> - + <import file="../testsuite/imports/server-config.xml"/> + <target name="init" unless="init.disable" depends="_buildmagic:init"> </target> @@ -84,8 +84,8 @@ <property name="jboss-junit-configuration" value=""/> <property name="junit.formatter.usefile" value="true"/> - <property name="test.reports" value="${module.output}/tests"/> - + <property name="test.reports" value="${module.output}/tests"/> + <!-- Configure thirdparty libraries --> &libraries; @@ -102,11 +102,11 @@ <path refid="hibernate.hibernate.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="jcaptcha.jcaptcha.classpath"/> - <path refid="jakarta.cactus.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="jbpm.jpdl.classpath"/> - <path refid="glassfish.jsf.classpath"/> + <path refid="jcaptcha.jcaptcha.classpath"/> + <path refid="jakarta.cactus.classpath"/> + <path refid="junit.junit.classpath"/> + <path refid="jbpm.jpdl.classpath"/> + <path refid="glassfish.jsf.classpath"/> <path refid="el.el.classpath"/> <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> @@ -126,7 +126,7 @@ <path refid="jboss.portal-theme.classpath"/> <path refid="jboss.portal-security.classpath"/> <path refid="jboss.portal-core.classpath"/> - <path refid="jboss.portal-workflow.classpath"/> + <path refid="jboss.portal-workflow.classpath"/> </path> <!--+=======================================+--> @@ -152,16 +152,16 @@ 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" - classname="org.jboss.portal.common.ant.Explode" - classpathref="explode.task.classpath"/> + <taskdef + name="explode" + classname="org.jboss.portal.common.ant.Explode" + classpathref="explode.task.classpath"/> </target> <!--+====================================================================+--> @@ -196,55 +196,55 @@ <!-- portal-core-identity-ui-lib.jar --> <jar jarfile="${build.lib}/portal-core-identity-ui-lib.jar"> - <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/ui/**" /> + <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/ui/**"/> </jar> - - <!-- portal-core-identity-services-lib.jar --> - <jar jarfile="${build.lib}/portal-core-identity-services-lib.jar"> - <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**" /> - </jar> - <!-- portal-identity.war --> - <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib"> - <fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/> - <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/> + <!-- portal-core-identity-services-lib.jar --> + <jar jarfile="${build.lib}/portal-core-identity-services-lib.jar"> + <fileset dir="${build.classes}" includes="org/jboss/portal/core/identity/services/**"/> + </jar> + + <!-- portal-identity.war --> + <copy todir="${build.resources}/portal-identity-war/WEB-INF/lib"> + <fileset dir="${build.lib}" includes="portal-core-identity-ui-lib.jar"/> + <fileset dir="${glassfish.jstl.lib}" includes="jstl.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> - <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> + <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> - </copy> - <copy todir="${build.resources}/portal-identity-war"> - <fileset dir="${source.bin}/portal-identity-war"/> - </copy> - + </copy> + <copy todir="${build.resources}/portal-identity-war"> + <fileset dir="${source.bin}/portal-identity-war"/> + </copy> + <!-- portal-identity.sar --> <copy todir="${build.resources}/portal-identity.sar"> <fileset dir="${build.resources}/portal-identity-sar"/> </copy> <copy todir="${build.resources}/portal-identity.sar/lib"> - <fileset dir="${build.lib}" includes="portal-core-identity-services-lib.jar" /> - <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> - <fileset dir="${jcaptcha.jcaptcha.root}/lib" includes="jcaptcha.jar"/> + <fileset dir="${build.lib}" includes="portal-core-identity-services-lib.jar"/> + <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.jar"/> + <fileset dir="${jcaptcha.jcaptcha.root}/lib" includes="jcaptcha.jar"/> </copy> <copy todir="${build.resources}/portal-identity.sar/portal-identity.war"> <fileset dir="${build.resources}/portal-identity-war"/> </copy> </target> - + <target name="output" depends="artifacts"> <implode dir="${build.resources}/portal-identity.sar" tofile="${build.lib}/portal-identity.sar"/> - </target> + </target> <!-- ================================================================== --> <!-- Cleaning --> @@ -288,10 +288,10 @@ <require file="${jboss.home}/server/${portal.deploy.dir}"/> <copy file="${build.lib}/portal-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> - + <!-- - | Undeploy the application - --> + | Undeploy the application + --> <target name="undeploy" description="Undeploy." depends="init"> @@ -304,53 +304,54 @@ --> <target name="package-tests" depends="init, clean-tests"> - - <jar jarfile="${build.lib}/portal-core-identity-test-lib.jar"> + + <jar jarfile="${build.lib}/portal-core-identity-test-lib.jar"> <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/> - </jar> - - </target> - + </jar> + + </target> + <target name="clean-tests" description="cleans the output from the package-test command"> - + </target> - + <target name="tests" depends="init, package-tests" description="Runs the core-identity tests"> - <mkdir dir="${test.reports}"/> - + <mkdir dir="${test.reports}"/> + <execute-tests> <x-test> - <test todir="${test.reports}" name="org.jboss.portal.test.core.identity.metadata.ConfigurationTestCase"/> + <test todir="${test.reports}" name="org.jboss.portal.test.core.identity.metadata.ConfigurationTestCase"/> </x-test> <x-classpath> - <path refid="junit.junit.classpath"/> - <path refid="jboss.jbossxb.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="jboss.portal-common.classpath"/> - <path refid="jboss.portal-portlet.classpath"/> - <path refid="jboss.portal-identity.classpath"/> - <path refid="jboss.portal-jems.classpath"/> - <path refid="jboss.portal-identity.classpath"/> - <path refid="jboss.portal-test.classpath"/> - <path refid="oswego.concurrent.classpath" /> - <path refid="apache.xerces.classpath"/> - <pathelement location="${build.lib}/portal-core-identity-ui-lib.jar"/> - <pathelement location="${build.lib}/portal-core-identity-services-lib.jar"/> - <pathelement location="${build.lib}/portal-core-identity-test-lib.jar"/> - <pathelement location="${build.resources}/test"/> + <path refid="junit.junit.classpath"/> + <path refid="jboss.jbossxb.classpath"/> + <path refid="jbossas/core.libs.classpath"/> + <path refid="jboss.portal-common.classpath"/> + <path refid="jboss.portal-portlet.classpath"/> + <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal-jems.classpath"/> + <path refid="jboss.portal-identity.classpath"/> + <path refid="jboss.portal-test.classpath"/> + <path refid="oswego.concurrent.classpath"/> + <path refid="apache.xerces.classpath"/> + <pathelement location="${build.lib}/portal-core-identity-ui-lib.jar"/> + <pathelement location="${build.lib}/portal-core-identity-services-lib.jar"/> + <pathelement location="${build.lib}/portal-core-identity-test-lib.jar"/> + <pathelement location="${build.resources}/test"/> </x-classpath> </execute-tests> - + </target> - + <!-- - Some convenience build targets to help deployment during development + Some convenience build targets to help deployment during development --> - <target name="deploy-ha" - description="Deploy." - depends="output"> - <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> - <copy file="${build.lib}/portal-identity.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" overwrite="true"/> - </target> - + <target name="deploy-ha" + description="Deploy." + depends="output"> + <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/> + <copy file="${build.lib}/portal-identity.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}" + overwrite="true"/> + </target> + </project>