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

[Julien Viet]

  User: julien  
  Date: 06/07/16 13:40:51

  Modified:    portlet  build.xml
  Log:
  use blocking deployment tasks for testsuite
  
  Revision  Changes    Path
  1.128     +4 -40     jboss-portal/portlet/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/build.xml,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -b -r1.127 -r1.128
  --- build.xml	16 Jul 2006 13:09:59 -0000	1.127
  +++ build.xml	16 Jul 2006 17:40:51 -0000	1.128
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.127 2006/07/16 13:09:59 julien Exp $ -->
  +<!-- $Id: build.xml,v 1.128 2006/07/16 17:40:51 julien Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -460,42 +460,6 @@
      <!-- Deployment                                                         -->
      <!-- ================================================================== -->
   
  -   <target name="deploy-test"
  -           description="Deploy."
  -           depends="output">
  -      <require file="${jboss.home}/server/${portal.deploy.dir}"/>
  -      <!--<copy file="${build.lib}/test.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>-->
  -
  -<!--
  -      <taskdef resource="cargo.tasks">
  -         <classpath>
  -            <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/>
  -            <pathelement location="../tools/lib/cargo-ant-0.8.jar"/>
  -         </classpath>
  -      </taskdef>
  -
  -      <cargo
  -         containerId="jboss4x"
  -         home="${jboss.home}"
  -         output="output.log"
  -         log="cargo.log"
  -         type="remote"
  -         action="start">
  -         <configuration
  -            type="runtime">
  -            <deployable type="war" file="${build.lib}/test.sar"/>
  -         </configuration>
  -      </cargo>
  --->
  -   </target>
  -
  -   <target name="undeploy-test"
  -           description="Undeploy."
  -           depends="init">
  -      <require file="${jboss.home}/server/${portal.deploy.dir}"/>
  -      <delete file="${jboss.home}/server/${portal.deploy.dir}/test.sar"/>
  -   </target>
  -
      <target name="deploy-tck"
              description="Deploy."
              depends="output">
  @@ -510,10 +474,10 @@
         <delete file="${jboss.home}/server/${portal.deploy.dir}/tck.sar"/>
      </target>
   
  -   <target name="test" depends="init">
  -      <antcall target="deploy-test"/>
  +   <target name="test" depends="init, _buildmagic:configure:deployment">
  +      <deploy file="${build.lib}/test.sar" config="default"/>
         <antcall target="test-jsr168"/>
  -      <antcall target="undeploy-test"/>
  +      <undeploy file="${build.lib}/test.sar" config="default"/>
         <antcall target="test-info"/>
      </target>