[portal-commits] JBoss Portal SVN: r9713 - modules/portlet/trunk/test/src/test.

Author: julien(a)jboss.com Date: 2008-02-02 09:21:03 -0500 (Sat, 02 Feb 2008) New Revision: 9713 Modified: modules/portlet/trunk/test/src/test/build.xml Log: update build.xml to avoid to use the test/target/test-classes directory as it is used to build jar files Modified: modules/portlet/trunk/test/src/test/build.xml =================================================================== --- modules/portlet/trunk/test/src/test/build.xml 2008-02-02 14:07:45 UTC (rev 9712) +++ modules/portlet/trunk/test/src/test/build.xml 2008-02-02 14:21:03 UTC (rev 9713) @@ -256,20 +256,29 @@ <attribute name="testsuitetype"/> <attribute name="testsuitename"/> <sequential> - <mkdir dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"/> - <copy todir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"> - <fileset dir="${test.temp.portlet}" - includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/> - <fileset dir="${test.temp.portlet}" - includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/> - <fileset dir="${test.temp.portlet}" includes="org/jboss/portal/test/portlet/framework/**"/> + <mkdir dir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"/> + <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"> + <fileset + dir="${test.temp.portlet}" + includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/> + <fileset + dir="${test.temp.portlet}" + includes="org/jboss/portal/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/> + <fileset + dir="${test.temp.portlet}" + includes="org/jboss/portal/test/portlet/framework/**"/> </copy> - <mkdir dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib"/> - <copy todir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib"> - <fileset dir="${test.temp.lib}" includes="portal-portlet-test-framework-lib.jar"/> + <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib"> + <fileset + dir="${test.temp.lib}" + includes="portal-portlet-test-framework-lib.jar"/> </copy> + <copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"> + <fileset + dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/> + </copy> <jar jarfile=&quot;${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war&quot;&gt; - <fileset dir="${target}/test-classes/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/> + <fileset dir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war"/> </jar> </sequential> </macrodef> @@ -280,6 +289,8 @@ <!--Portlet test framework lib jar--> <jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar"> + + <!-- --> <fileset dir="${test.temp.portlet}" includes="org/jboss/portal/unit/**"/> <!-- JSR 168 TLD --> @@ -314,7 +325,6 @@ <package-tck-test test="portleturl"/> <package-tck-test test="windowstates"/> <package-tck-test test="portletcontext"/> - <package-api-test test="portletconfig"/> <package-api-test test="portletmode"/> <package-api-test test="windowstate"/> @@ -328,7 +338,6 @@ <package-api-test test="renderrequest"/> <package-api-test test="actionresponse"/> <package-api-test test="renderresponse"/> - <package-ext-test test="nocache"/> <package-ext-test test="expiringcache"/> <package-ext-test test="neverexpiringcache"/> @@ -339,9 +348,7 @@ <package-ext-test test="portletmode"/> <package-ext-test test="portletconfig"/> <package-ext-test test="taglib"/> - <package-misc-test test="log4j"/> - <package-jsr286-tck-test test="dispatcher"/> <package-jsr286-tck-test test="portletconfig"/> <package-jsr286-tck-test test="portletconfignonamespace"/> @@ -351,13 +358,12 @@ <package-jsr286-tck-test test="portletrequests"/> <package-jsr286-tck-test test="resourceserving"/> <package-jsr286-tck-test test="portleturl"/> - <package-jsr286-api-test test="event"/> - <package-jsr286-ext-test test="portletrequests"/> <package-jsr286-ext-test test="portletresponses"/> <package-jsr286-ext-test test="dispatcher"/> + <!-- --> <jar jarfile="${test.temp.lib}/portlet-test-lib.jar"> <fileset dir="${target}/test-classes"/> <fileset dir="${target}/classes"/> @@ -365,11 +371,16 @@ <!-- JBoss 4.2 portlet-test.war --> - <copy todir="${target}/test-classes/jboss-4.2/portlet-test-war/WEB-INF/lib" flatten="true"> + <copy todir="${test.temp.dir}/jboss-4.2/portlet-test-war"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${target}/test-classes/jboss-4.2/portlet-test-war"/> + </copy> + <copy todir="${test.temp.dir}/jboss-4.2/portlet-test-war/WEB-INF/lib" flatten="true"> <!-- --> <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <!-- --> <path refid="mc.portal-common"/> <!-- Remote plugin --> @@ -392,16 +403,20 @@ </copy> <mkdir dir="${test.temp.lib}/jboss-4.2"/> <jar jarfile="${test.temp.lib}/jboss-4.2/portlet-test.war"> - <fileset dir="${target}/test-classes/jboss-4.2/portlet-test-war"/> - <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${test.temp.dir}/jboss-4.2/portlet-test-war"/> </jar> <!-- Tomcat 6.0 portlet-test.war --> - <copy todir="${target}/test-classes/tomcat-6.0/portlet-test-war/WEB-INF/lib" flatten="true"> + <copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war"> + <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${target}/test-classes/tomcat-6.0/portlet-test-war"/> + </copy> + <copy todir="${test.temp.dir}/tomcat-6.0/portlet-test-war/WEB-INF/lib" flatten="true"> <!-- --> <fileset dir="${test.temp.lib}" includes="portlet-test-lib.jar"/> + <!-- --> <path refid="mc.portal-common"/> <!-- Remote plugin --> @@ -423,8 +438,7 @@ </copy> <mkdir dir="${test.temp.lib}/tomcat-6.0"/> <jar jarfile="${test.temp.lib}/tomcat-6.0/portlet-test.war"> - <fileset dir="${target}/test-classes/tomcat-6.0/portlet-test-war"/> - <fileset dir="${target}/test-classes/portlet-test-war"/> + <fileset dir="${test.temp.dir}/tomcat-6.0/portlet-test-war"/> </jar> <!-- Strip cargo manager war filename--> @@ -647,7 +661,8 @@ <classpath> <pathelement location="${target}/classes"/> - <pathelement location="${target}/test-classes"/> + <pathelement location="${test.temp.lib}"/> + <!--<pathelement location="${target}/test-classes"/>--> <pathelement location="${target}/test-classes/test"/> <pathelement path="${test_classpath}"/> </classpath> @@ -664,7 +679,7 @@ </jar> <!-- simple-portal.war --> - <copy todir="${target}/test-classes/simple-portal-war/WEB-INF/lib" flatten="true"> + <copy todir="${test.temp.dir}/simple-portal-war/WEB-INF/lib" flatten="true"> <!-- --> <fileset dir="${target}" includes="portlet-test-lib.jar"/> @@ -702,7 +717,7 @@ </copy> <jar jarfile="${target}/simple-portal.war"> - <fileset dir="${target}/test-classes/simple-portal-war"/> + <fileset dir="${test.temp.dir}/simple-portal-war"/> </jar> <delete file="${target}/portlet-test-lib.jar"/>