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

[Chris Laprun]

  User: claprun 
  Date: 06/08/24 20:56:30

  Modified:    wsrp     Tag: JBoss_Portal_Branch_2_4 build.xml
  Log:
  - Re-wrote cookie/session management. Now handles cookies outside of initCookie calls. Still needs more testing.
  - Added ProducerSessionInformationTestCase and other-tests in build.xml for WSRP.
  - Minor improvements.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.87.2.1  +35 -3     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.87
  retrieving revision 1.87.2.1
  diff -u -b -r1.87 -r1.87.2.1
  --- build.xml	8 Aug 2006 20:54:54 -0000	1.87
  +++ build.xml	25 Aug 2006 00:56:29 -0000	1.87.2.1
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.87 2006/08/08 20:54:54 claprun Exp $ -->
  +<!-- $Id: build.xml,v 1.87.2.1 2006/08/25 00:56:29 claprun Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -98,6 +98,8 @@
            <path refid="dom4j.dom4j.classpath"/>
            <path refid="ibm.wsdl4j.classpath"/>
            <path refid="jboss.jbossxb.classpath"/>
  +         <path refid="apache.httpclient.classpath"/>
  +         <path refid="apache.logging.classpath"/>
         </path>
   
   
  @@ -300,7 +302,7 @@
      <!-- Tests                                                              -->
      <!-- ================================================================== -->
   
  -   <target name="package-deployment-test" description="Generates the consumer test artifacts" depends="init">
  +   <target name="package-deployment-test" description="Generates the deployment test artifacts" depends="init">
         <jar jarfile="${build.lib}/test-deployment-lib.jar">
             <fileset dir="${build.resources}/test-deployment-lib-jar"/>
             <fileset dir="${build.classes}/">
  @@ -309,6 +311,14 @@
         </jar>
      </target>
   
  +   <target name="package-other-test" description="Generates the test artifacts" depends="init">
  +      <jar jarfile="${build.lib}/test-other-lib.jar">
  +          <fileset dir="${build.classes}/">
  +             <include name="org/jboss/portal/test/wsrp/*TestCase.class"/>
  +          </fileset>
  +      </jar>
  +   </target>
  +
      <target name="package-consumer-test" description="Generates the consumer test artifacts" depends="init">
         <jar jarfile="${build.lib}/test-wsrp-consumer-client.jar">
            <fileset dir="${build.resources}/test-wsrp-consumer-client"/>
  @@ -451,6 +461,7 @@
         <antcall target="producer-test"/>
         <antcall target="consumer-test"/>
         <antcall target="deployment-test"/>
  +      <antcall target="other-test"/>
         <antcall target="agent-undeploy"/>
         <server:stop name="default"/>
         <antcall target="reports"/>
  @@ -460,8 +471,10 @@
         <antcall target="producer-test"/>
         <antcall target="consumer-test"/>
         <antcall target="deployment-test"/>
  +      <antcall target="other-test"/>
      </target>
   
  +   <!-- WSRP Producer tests -->
      <target name="producer-test" depends="deploy-producer-test">
         <execute-tests>
            <x-test>
  @@ -532,6 +545,25 @@
         </execute-tests>
       </target>
   
  +   <!-- Other WSRP tests-->
  +   <target name="other-test" depends="package-other-test">
  +      <execute-tests>
  +         <x-test>
  +            <test todir="${test.reports}" name="org.jboss.portal.test.wsrp.ProducerSessionInformationTestCase"/>
  +         </x-test>
  +         <x-sysproperty>
  +            <sysproperty key="test.root" value="${build.lib}"/>
  +         </x-sysproperty>
  +         <x-classpath>
  +            <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar, test-other-lib.jar"/>
  +            <path refid="jboss.microcontainer.classpath"/>
  +            <path refid="library.classpath"/>
  +            <path refid="dependentmodule.classpath"/>
  +            <path refid="ws.classpath"/>
  +         </x-classpath>
  +      </execute-tests>
  +   </target>
  +
       <target name="reports">
         <junitreport todir="${reports.dir}">
            <fileset dir="${test.reports}">