[jboss-cvs] jboss-portal/portlet ...
Julien Viet
julien at jboss.com
Sun Jul 16 19:32:19 EDT 2006
User: julien
Date: 06/07/16 19:32:19
Modified: portlet build.xml
Log:
use macro instead of target to package test wars resulting in more readable file
Revision Changes Path
1.130 +77 -175 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.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- build.xml 16 Jul 2006 22:51:01 -0000 1.129
+++ build.xml 16 Jul 2006 23:32:18 -0000 1.130
@@ -8,7 +8,7 @@
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
]>
-<!-- $Id: build.xml,v 1.129 2006/07/16 22:51:01 julien Exp $ -->
+<!-- $Id: build.xml,v 1.130 2006/07/16 23:32:18 julien Exp $ -->
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -245,188 +245,90 @@
</jar>
<!-- JSR 168 test case packaging -->
-
- <!-- Portlet interface test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletinterface"/>
- </antcall>
-
- <!-- Portlet dispatcher test case -->
- <antcall target="package-tck-test">
- <param name="test" value="dispatcher"/>
- </antcall>
-
- <!-- Basic test case -->
- <antcall target="package-tck-test">
- <param name="test" value="basic"/>
- </antcall>
-
- <!-- Portlet request test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletrequests"/>
- </antcall>
-
- <!-- Portlet mode test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletmode"/>
- </antcall>
-
- <!-- Portlet config test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletconfig"/>
- </antcall>
-
- <!-- Portlet renderresponse test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletresponses"/>
- </antcall>
-
- <!-- Portlet preferences test case -->
- <antcall target="package-tck-test">
- <param name="test" value="preferences"/>
- </antcall>
-
- <!-- Portlet cross context test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletsession"/>
- </antcall>
-
- <!-- Portlet URL test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portleturl"/>
- </antcall>
-
- <!-- Portlet window states test case -->
- <antcall target="package-tck-test">
- <param name="test" value="windowstates"/>
- </antcall>
-
- <!-- Portlet portlet context test case -->
- <antcall target="package-tck-test">
- <param name="test" value="portletcontext"/>
- </antcall>
-
+ <package-tck-test test="portletinterface"/>
+ <package-tck-test test="dispatcher"/>
+ <package-tck-test test="basic"/>
+ <package-tck-test test="portletrequests"/>
+ <package-tck-test test="portletmode"/>
+ <package-tck-test test="portletconfig"/>
+ <package-tck-test test="portletresponses"/>
+ <package-tck-test test="preferences"/>
+ <package-tck-test test="portletsession"/>
+ <package-tck-test test="portleturl"/>
+ <package-tck-test test="windowstates"/>
+ <package-tck-test test="portletcontext"/>
<!-- API tests -->
- <antcall target="package-api-test">
- <param name="test" value="portletconfig"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portletmode"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="windowstate"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portletsessionutil"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portalcontext"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portletcontext"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portleturl"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portletpreferences"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="portletsession"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="actionrequest"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="renderrequest"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="actionresponse"/>
- </antcall>
-
- <antcall target="package-api-test">
- <param name="test" value="renderresponse"/>
- </antcall>
+ <package-api-test test="portletconfig"/>
+ <package-api-test test="portletmode"/>
+ <package-api-test test="windowstate"/>
+ <package-api-test test="portletsessionutil"/>
+ <package-api-test test="portalcontext"/>
+ <package-api-test test="portletcontext"/>
+ <package-api-test test="portleturl"/>
+ <package-api-test test="portletpreferences"/>
+ <package-api-test test="portletsession"/>
+ <package-api-test test="actionrequest"/>
+ <package-api-test test="renderrequest"/>
+ <package-api-test test="actionresponse"/>
+ <package-api-test test="renderresponse"/>
<!-- Ext tests -->
- <antcall target="package-ext-test">
- <param name="test" value="preferences"/>
- </antcall>
-
- <antcall target="package-ext-test">
- <param name="test" value="session"/>
- </antcall>
-
- <antcall target="package-ext-test">
- <param name="test" value="portletresponses"/>
- </antcall>
-
- <antcall target="package-ext-test">
- <param name="test" value="portletrequests"/>
- </antcall>
-
- <antcall target="package-ext-test">
- <param name="test" value="portletmode"/>
- </antcall>
-
- <antcall target="package-ext-test">
- <param name="test" value="portletconfig"/>
- </antcall>
-
- <antcall target="package-ext-test">
- <param name="test" value="dispatcher"/>
- </antcall>
+ <package-ext-test test="preferences"/>
+ <package-ext-test test="session"/>
+ <package-ext-test test="portletresponses"/>
+ <package-ext-test test="portletrequests"/>
+ <package-ext-test test="portletmode"/>
+ <package-ext-test test="portletconfig"/>
+ <package-ext-test test="dispatcher"/>
</target>
- <target name="package-ext-test">
- <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}/**"/>
+ <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>
- </target>
-
- <target name="package-tck-test">
- <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}/**"/>
+ <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>
- </target>
-
- <target name="package-api-test">
- <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}/**"/>
+ <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"/>
+ <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>
- </target>
+ </sequential>
+ </macrodef>
<!-- ================================================================== -->
<!-- Cleaning -->
More information about the jboss-cvs-commits
mailing list