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

Rali Genova rgenova at jboss.org
Mon Jul 24 16:44:29 EDT 2006


  User: rgenova 
  Date: 06/07/24 16:44:29

  Modified:    portlet  build.xml
  Log:
  updated testsuite module and all modules that are currently running tests
  
  Revision  Changes    Path
  1.132     +191 -173  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.131
  retrieving revision 1.132
  diff -u -b -r1.131 -r1.132
  --- build.xml	16 Jul 2006 23:38:54 -0000	1.131
  +++ build.xml	24 Jul 2006 20:44:29 -0000	1.132
  @@ -8,7 +8,7 @@
      <!ENTITY targets    SYSTEM "../tools/etc/buildfragments/targets.ent">
      ]>
   
  -<!-- $Id: build.xml,v 1.131 2006/07/16 23:38:54 julien Exp $ -->
  +<!-- $Id: build.xml,v 1.132 2006/07/24 20:44:29 rgenova Exp $ -->
   
   <!--+======================================================================+-->
   <!--| JBoss Portal (The OpenSource Portal) Build File                      |-->
  @@ -181,20 +181,100 @@
            <fileset dir="${build.classes}" includes="org/jboss/portal/portlet/tck/**"/>
         </jar>
   
  -      <!-- Sample war -->
  +	      <!-- TCK sar -->
  +	      <copy todir="${build.resources}/tck-sar">
  +	         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
  +	         <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
  +	         <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
  +	         <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
  +	         <fileset dir="${build.lib}" includes="portal-portlet-lib.jar,portal-portlet-tck-lib.jar,test.war"/>
  +	      </copy>
  +	      <jar jarfile="${build.lib}/tck.sar">
  +	         <fileset dir="${build.resources}/tck-sar"/>
  +	      </jar>
  +
  +	   </target>
  +
  +	   <macrodef name="package-ext-test">
  +	      <attribute name="test"/>
  +	      <sequential>
  +	         <mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/classes"/>
  +	         <copy todir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/classes">
  +	            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/ext/@{test}/**"/>
  +	            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
  +	         </copy>
  +	         <mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib"/>
  +	         <jar jarfile="${build.lib}/test-jsr168-ext-@{test}.war">
  +	            <fileset dir="${build.resources}/test/jsr168/ext/@{test}-war"/>
  +	         </jar>
  +	      </sequential>
  +	   </macrodef>
  +
  +	   <macrodef name="package-tck-test">
  +	      <attribute name="test"/>
  +	      <sequential>
  +	         <mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/classes"/>
  +	         <copy todir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/classes">
  +	            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/tck/@{test}/**"/>
  +	            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
  +	         </copy>
  +	         <mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib"/>
  +	         <jar jarfile="${build.lib}/test-jsr168-@{test}.war">
  +	            <fileset dir="${build.resources}/test/jsr168/tck/@{test}-war"/>
  +	         </jar>
  +	      </sequential>
  +	   </macrodef>
  +
  +	   <macrodef name="package-api-test">
  +	      <attribute name="test"/>
  +	      <sequential>
  +	         <mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/classes"/>
  +	         <copy todir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/classes">
  +	            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/api/@{test}/**"/>
  +	            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
  +	         </copy>
  +	         <mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib"/>
  +	         <jar jarfile="${build.lib}/test-jsr168-api-@{test}.war">
  +	            <fileset dir="${build.resources}/test/jsr168/api/@{test}-war"/>
  +	         </jar>
  +	      </sequential>
  +	   </macrodef>
  +	   
  +	   <!-- create artifacts for running the portlet tests (except TCK)
  +	        target output should have already been executed -->
  +	        
  +	   <target name="package-tests" depends="init">
  +	   <!-- Portlet test lib jar -->
  +	      <jar jarfile="${build.lib}/portal-portlet-test-lib.jar">
  +	         <fileset dir="${build.classes}" includes="org/jboss/portal/portlet/test/**"/>
  +	      </jar>
  +
  +	      <!-- Portlet tck lib jar -->
  +	      <jar jarfile="${build.lib}/portal-portlet-tck-lib.jar">
  +	         <fileset dir="${build.classes}" includes="org/jboss/portal/portlet/tck/**"/>
  +	      </jar>      
  +
  +	      <!-- TCK sar -->
  +	      <copy todir="${build.resources}/tck-sar">
  +	         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
  +	         <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
  +	         <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
  +	         <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
  +	         <fileset dir="${build.lib}" includes="portal-portlet-lib.jar,portal-portlet-tck-lib.jar,test.war"/>
  +	      </copy>
  +	      <jar jarfile="${build.lib}/tck.sar">
  +	         <fileset dir="${build.resources}/tck-sar"/>
  +	      </jar>   
  +	   
         <copy todir="${build.resources}/samples-war/WEB-INF/classes">
            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/*.class"/>
         </copy>
         <jar jarfile="${build.lib}/samples.war">
            <fileset dir="${build.resources}/samples-war"/>
         </jar>
  -
  -      <!-- Test war -->
         <jar jarfile="${build.lib}/test.war">
            <fileset dir="${build.resources}/test-war"/>
         </jar>
  -
  -      <!-- Test sar -->
         <copy todir="${build.resources}/test-sar">
            <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
            <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
  @@ -207,20 +287,6 @@
         <jar jarfile="${build.lib}/test.sar">
            <fileset dir="${build.resources}/test-sar"/>
         </jar>
  -
  -      <!-- TCK sar -->
  -      <copy todir="${build.resources}/tck-sar">
  -         <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
  -         <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
  -         <fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
  -         <fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
  -         <fileset dir="${build.lib}" includes="portal-portlet-lib.jar,portal-portlet-tck-lib.jar,test.war"/>
  -      </copy>
  -      <jar jarfile="${build.lib}/tck.sar">
  -         <fileset dir="${build.resources}/tck-sar"/>
  -      </jar>
  -
  -      <!-- -->
         <jar jarfile="${build.lib}/test-info.war">
            <fileset dir="${build.resources}/test/info/test-info-war"/>
         </jar>
  @@ -235,8 +301,6 @@
            <fileset dir="${build.resources}/test/info/test-info-sar"/>
            <fileset dir="${build.lib}" includes="test-info.war"/>
         </jar>
  -
  -      <!-- -->
         <jar jarfile="${build.lib}/test-ha-session.war">
            <fileset dir="${build.resources}/test/ha/test-session-war"/>
            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/ha/session/**"/>
  @@ -281,54 +345,8 @@
         <package-ext-test test="portletconfig"/>
         <package-ext-test test="dispatcher"/>
   
  -
      </target>
   
  -   <macrodef name="package-ext-test">
  -      <attribute name="test"/>
  -      <sequential>
  -         <mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/classes"/>
  -         <copy todir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/classes">
  -            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/ext/@{test}/**"/>
  -            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
  -         </copy>
  -         <mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib"/>
  -         <jar jarfile="${build.lib}/test-jsr168-ext-@{test}.war">
  -            <fileset dir="${build.resources}/test/jsr168/ext/@{test}-war"/>
  -         </jar>
  -      </sequential>
  -   </macrodef>
  -
  -   <macrodef name="package-tck-test">
  -      <attribute name="test"/>
  -      <sequential>
  -         <mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/classes"/>
  -         <copy todir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/classes">
  -            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/tck/@{test}/**"/>
  -            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
  -         </copy>
  -         <mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib"/>
  -         <jar jarfile="${build.lib}/test-jsr168-@{test}.war">
  -            <fileset dir="${build.resources}/test/jsr168/tck/@{test}-war"/>
  -         </jar>
  -      </sequential>
  -   </macrodef>
  -
  -   <macrodef name="package-api-test">
  -      <attribute name="test"/>
  -      <sequential>
  -         <mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/classes"/>
  -         <copy todir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/classes">
  -            <fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/jsr168/api/@{test}/**"/>
  -            <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/portlet/**"/>
  -         </copy>
  -         <mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib"/>
  -         <jar jarfile="${build.lib}/test-jsr168-api-@{test}.war">
  -            <fileset dir="${build.resources}/test/jsr168/api/@{test}-war"/>
  -         </jar>
  -      </sequential>
  -   </macrodef>
  -
      <!-- ================================================================== -->
      <!-- Cleaning                                                           -->
      <!-- ================================================================== -->
  @@ -375,7 +393,7 @@
         <delete file="${jboss.home}/server/${portal.deploy.dir}/tck.sar"/>
      </target>
   
  -   <target name="test" depends="init, _buildmagic:configure:deployment">
  +   <target name="tests" depends="init, _buildmagic:configure:deployment">
         <deploy file="${build.lib}/test.sar" config="default"/>
         <antcall target="test-jsr168"/>
         <undeploy file="${build.lib}/test.sar" config="default"/>
  
  
  



More information about the jboss-cvs-commits mailing list