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

[Chris Laprun]

  User: claprun 
  Date: 06/08/04 12:24:10

  Modified:    wsrp     build.xml
  Log:
  - Fixed deploy/undeploy targets (they shouldn't have used cargo).
  - Fixed incorrect directory for reports target.
  - Added debugging information in test targets.
  
  Revision  Changes    Path
  1.85      +15 -6     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.84
  retrieving revision 1.85
  diff -u -b -r1.84 -r1.85
  --- build.xml	2 Aug 2006 23:48:23 -0000	1.84
  +++ build.xml	4 Aug 2006 16:24:10 -0000	1.85
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.84 2006/08/02 23:48:23 claprun Exp $ -->
  +<!-- $Id: build.xml,v 1.85 2006/08/04 16:24:10 claprun Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -257,14 +257,15 @@
         <undeploy file="../test/output/lib/portal-test.sar" config="default"/>
      </target>
   
  -   <target name="deploy" description="Deploy WSRP" depends="output, undeploy">
  +   <target name="deploy" description="Deploy WSRP" depends="output">
  +      <require file="${jboss.home}/server/${portal.deploy.dir}"/>
  +      <copy file="./output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
         <require file="${jboss.deploy.dir}"/>
  -      <deploy file="${build.lib}/portal-wsrp.sar" config="default"/>
      </target>
   
      <target name="undeploy" description="Undeploy WSRP" depends="init">
  -      <require file="${jboss.deploy.dir}"/>
  -      <undeploy file="${build.lib}/portal-wsrp.sar" config="default"/>
  +      <require file="${jboss.home}/server/${portal.deploy.dir}"/>
  +      <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/>
      </target>
   
      <target name="deploy-producer-test" description="Deploy services needed to test WSRP."
  @@ -456,6 +457,10 @@
               <!--<test name="org.jboss.portal.test.wsrp.v1.producer.RegistrationTestCase"/>-->
            </x-test>
            <x-sysproperty>
  +            <jvmarg value="-Xdebug"/>
  +            <jvmarg value="-Xnoagent"/>
  +            <jvmarg value="-Djava.compiler=NONE"/>
  +            <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>
               <sysproperty key="test.root" value="${build.lib}"/>
            </x-sysproperty>
            <x-classpath>
  @@ -478,6 +483,10 @@
               <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.v1.consumer.ServiceDescriptionTestCase"/>
            </x-test>
            <x-sysproperty>
  +            <jvmarg value="-Xdebug"/>
  +            <jvmarg value="-Xnoagent"/>
  +            <jvmarg value="-Djava.compiler=NONE"/>
  +            <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>
               <sysproperty key="test.root" value="${build.lib}"/>
            </x-sysproperty>
            <x-classpath>
  @@ -512,7 +521,7 @@
   
       <target name="reports">
         <junitreport todir="${reports.dir}">
  -         <fileset dir="wsrp/output/reports">
  +         <fileset dir="output/reports">
               <include name="TEST-*.xml"/>
            </fileset>
            <report format="frames"