[jboss-cvs] jboss-portal/wsrp ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/08 00:34:39

  Modified:    wsrp     build.xml
  Log:
  - Optimized some targets by preventing targets to be called several times when not required.
  - Added overwrite=true where appropriate.
  - Now inits test.reports in case the build is running in standalone instead of via testsuite.
  
  Revision  Changes    Path
  1.86      +25 -25    jboss-portal/wsrp/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/wsrp/build.xml,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -b -r1.85 -r1.86
  --- build.xml	4 Aug 2006 16:24:10 -0000	1.85
  +++ build.xml	8 Aug 2006 04:34:38 -0000	1.86
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.85 2006/08/04 16:24:10 claprun Exp $ -->
  +<!-- $Id: build.xml,v 1.86 2006/08/08 04:34:38 claprun Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -143,8 +143,10 @@
         <property name="javadoc.private" value="true"/>
         <property name="javadoc.protected" value="false"/>
         <property name="jboss.deploy.dir" value="${jboss.home}/server/${portal.deploy.dir}"/>
  +
         <property name="log.dir" value="${module.output}/logs"/>
         <property name="reports.dir" value="${module.output}/reports"/>
  +      <property name="test.reports" value="${module.output}/tests"/>
       </target>
   
       <target name="configure-explode">
  @@ -266,19 +268,19 @@
      <target name="undeploy" description="Undeploy WSRP" depends="init">
         <require file="${jboss.home}/server/${portal.deploy.dir}"/>
         <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
  +      <delete file="${jboss.home}/server/${portal.deploy.dir}/test-wsrp-consumer.sar"/>
  +      <delete file="${jboss.home}/server/${portal.deploy.dir}/test-wsrp-producer.sar"/>
      </target>
   
  -   <target name="deploy-producer-test" description="Deploy services needed to test WSRP."
  +   <target name="deploy-producer-test" description="Deploy services needed to test the WSRP Producer."
              depends="package-producer-test">
         <require file="${jboss.deploy.dir}"/>
  -      <undeploy file="${build.lib}/test-wsrp-consumer.sar" config="default"/>
         <deploy file="${build.lib}/test-wsrp-producer.sar" config="default"/>
      </target>
   
  -   <target name="deploy-consumer-test" description="Deploy services needed to test WSRP Consumer."
  +   <target name="deploy-consumer-test" description="Deploy services needed to test the WSRP Consumer."
              depends="package-consumer-test">
         <require file="${jboss.deploy.dir}"/>
  -      <undeploy file="${build.lib}/test-wsrp-producer.sar" config="default"/>
         <deploy file="${build.lib}/test-wsrp-consumer.sar" config="default"/>
      </target>
   
  @@ -321,7 +323,7 @@
         </jar>
   
         <!--all server side stuff for consumer tests-->
  -      <copy todir="${build.resources}/test-wsrp-consumer-sar">
  +      <copy todir="${build.resources}/test-wsrp-consumer-sar" overwrite="true">
            <fileset dir="${build.lib}" includes="test-wsrp-consumer.war"/>
            <fileset dir="${build.lib}" includes="test-wsrp-consumer.jar"/>
            <fileset dir="${build.lib}" includes="test-wsrp-consumer-client.jar"/>
  @@ -330,11 +332,12 @@
         </copy>
   
         <mkdir dir="${build.resources}/test-wsrp-consumer-sar/lib"/>
  -      <copy todir="${build.resources}/test-wsrp-consumer-sar/lib">
  +      <copy todir="${build.resources}/test-wsrp-consumer-sar/lib" overwrite="true">
            <fileset dir="${build.lib}" includes="test-wsrp-consumer-lib.jar"/>
            <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
            <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
  -         <fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/>
  +         <fileset dir="${jboss.portal-portlet.root}/lib"
  +                  includes="portal-portlet-lib.jar, portal-portlet-test-lib.jar"/>
            <fileset dir="${jboss.portal-federation.root}/lib" includes="portal-federation-lib.jar"/>
         </copy>
   
  @@ -370,7 +373,7 @@
            <fileset dir="${build.classes}"/>
         </jar>
   
  -      <copy todir="${build.resources}/test-wsrp-producer-sar">
  +      <copy todir="${build.resources}/test-wsrp-producer-sar" overwrite="true">
            <fileset dir="${build.lib}" includes="test-wsrp-producer.war"/>
            <fileset dir="${build.lib}" includes="test-wsrp-producer.jar"/>
            <fileset dir="${build.lib}" includes="test-wsrp-producer-client.jar"/>
  @@ -379,7 +382,7 @@
         </copy>
   
         <mkdir dir="${build.resources}/test-wsrp-producer-sar/lib"/>
  -      <copy todir="${build.resources}/test-wsrp-producer-sar/lib">
  +      <copy todir="${build.resources}/test-wsrp-producer-sar/lib" overwrite="true">
            <fileset dir="${build.lib}" includes="test-wsrp-producer-lib.jar"/>
            <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
            <fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
  @@ -430,7 +433,7 @@
         <delete dir="${reports.dir}"/>
      </target>
   
  -   <target name="tests-local" depends="clean, output, clean-test, package-tests">
  +   <target name="tests-local" depends="clean, output, clean-test">
         <server:start name="default"/>
         <antcall target="agent-deploy"/>
         <antcall target="producer-test"/>
  @@ -441,14 +444,13 @@
         <antcall target="reports"/>
      </target>
   
  -   <target name="tests" depends="clean-test, package-tests">
  +   <target name="tests" depends="clean-test">
         <antcall target="producer-test"/>
         <antcall target="consumer-test"/>
         <antcall target="deployment-test"/>
      </target>
   
  -   <target name="producer-test" depends="package-producer-test">
  -      <antcall target="deploy-producer-test"/>
  +   <target name="producer-test" depends="deploy-producer-test">
         <execute-tests>
            <x-test>
               <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.v1.producer.PortletManagementTestCase"/>
  @@ -475,8 +477,7 @@
       </target>
   
      <!--WSRP Consumer implementation tests-->
  -   <target name="consumer-test" depends="package-consumer-test">
  -      <antcall target="deploy-consumer-test"/>
  +   <target name="consumer-test" depends="deploy-consumer-test">
         <execute-tests>
            <x-test>
               <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.v1.consumer.MarkupTestCase"/>
  @@ -521,11 +522,10 @@
   
       <target name="reports">
         <junitreport todir="${reports.dir}">
  -         <fileset dir="output/reports">
  +         <fileset dir="${test.reports}">
               <include name="TEST-*.xml"/>
            </fileset>
  -         <report format="frames"
  -                 todir="${reports.dir}"/>
  +         <report format="frames" todir="${reports.dir}"/>
         </junitreport>
      </target>