[jboss-cvs] jboss-portal/wsrp ...
Chris Laprun
chris.laprun at jboss.com
Wed Jul 26 05:38:42 EDT 2006
User: claprun
Date: 06/07/26 05:38:42
Modified: wsrp build.xml
Log:
- Fixed WSRP build.
- Renamed execute-tests to tests-local to run tests locally (i.e. not in the context of the testsuite).
- Minor improvements.
Revision Changes Path
1.80 +31 -54 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.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- build.xml 24 Jul 2006 21:32:03 -0000 1.79
+++ build.xml 26 Jul 2006 09:38:42 -0000 1.80
@@ -8,7 +8,7 @@
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
]>
-<!-- $Id: build.xml,v 1.79 2006/07/24 21:32:03 rgenova Exp $ -->
+<!-- $Id: build.xml,v 1.80 2006/07/26 09:38:42 claprun Exp $ -->
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -48,8 +48,6 @@
<property environment="env"/>
<property name="junit.formatter.usefile" value="true"/>
<property name="jboss.junit.config" value=""/>
- <property name="log.dir" value="${module.output}/logs"/>
- <property name="reports.dir" value="${module.output}/reports"/>
<path id="portal.task.classpath">
<pathelement location="${project.tools}/lib/ant.jar"/>
@@ -145,7 +143,8 @@
<property name="javadoc.private" value="true"/>
<property name="javadoc.protected" value="false"/>
<property name="jboss.deploy.dir" value="${jboss.home}/server/${portal.deploy.dir}"/>
-
+ <property name="log.dir" value="${module.output}/logs"/>
+ <property name="reports.dir" value="${module.output}/reports"/>
</target>
<target name="configure-explode">
@@ -393,60 +392,25 @@
<!-- Test portlets -->
<target name="package-test-portlets" description="Generate the test portlets archives" depends="init">
<!-- Simple test portlet -->
- <jar jarfile="${build.lib}/test-basic-portlet.war">
- <fileset dir="${build.resources}/test-basic-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/BasicPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="basic" portletName="Basic"/>
<!-- Markup test portlet -->
- <jar jarfile="${build.lib}/test-markup-portlet.war">
- <fileset dir="${build.resources}/test-markup-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/MarkupPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="markup" portletName="Markup"/>
<!-- Session test portlet -->
- <jar jarfile="${build.lib}/test-session-portlet.war">
- <fileset dir="${build.resources}/test-session-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/SessionPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="session" portletName="Session"/>
<!-- Session test portlet -->
- <jar jarfile="${build.lib}/test-renderparam-portlet.war">
- <fileset dir="${build.resources}/test-renderparam-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/RenderParamPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="renderparam" portletName="RenderParam"/>
<!-- Dispatcher test portlet -->
- <jar jarfile="${build.lib}/test-dispatcher-portlet.war">
- <fileset dir="${build.resources}/test-dispatcher-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/DispatcherPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="dispatcher" portletName="Dispatcher"/>
<!-- GetLocales test portlet -->
- <jar jarfile="${build.lib}/test-getlocales-portlet.war">
- <fileset dir="${build.resources}/test-getlocales-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/GetLocalesPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="getlocales" portletName="GetLocales"/>
<!-- Encode URL test portlet -->
- <jar jarfile="${build.lib}/test-encodeurl-portlet.war">
- <fileset dir="${build.resources}/test-encodeurl-portlet-war"/>
- <fileset dir="${build.classes}">
- <include name="org/jboss/portal/test/wsrp/portlet/EncodeURLPortlet.class"/>
- </fileset>
- </jar>
+ <package-test-portlet archiveName="encodeurl" portletName="EncodeURL"/>
</target>
<!-- Packages all the test related artifacts. Note that compilation should have be-->
@@ -463,21 +427,21 @@
<delete dir="${reports.dir}"/>
</target>
- <target name="execute-tests" depends="clean-test, package-tests">
+ <target name="tests-local" depends="clean, output, clean-test, package-tests">
+ <server:start name="default"/>
+ <antcall target="agent-deploy"/>
<antcall target="producer-test"/>
<antcall target="consumer-test"/>
<antcall target="deployment-test"/>
+ <antcall target="agent-undeploy"/>
+ <server:stop name="default"/>
+ <antcall target="reports"/>
</target>
- <target name="tests" depends="clean, output, clean-test, package-tests">
- <!-- <server:start name="default"/> -->
- <antcall target="agent-deploy"/>
+ <target name="tests" depends="clean-test, package-tests">
<antcall target="producer-test"/>
<antcall target="consumer-test"/>
<antcall target="deployment-test"/>
- <antcall target="agent-undeploy"/>
- <!-- <server:stop name="default"/> -->
- <!-- <antcall target="reports"/>-->
</target>
<target name="producer-test" depends="package-producer-test">
@@ -554,4 +518,17 @@
</junitreport>
</target>
+ <macrodef name="package-test-portlet">
+ <attribute name="archiveName"/>
+ <attribute name="portletName"/>
+ <sequential>
+ <jar jarfile="${build.lib}/test-@{archiveName}-portlet.war">
+ <fileset dir="${build.resources}/test-@{archiveName}-portlet-war"/>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/portal/test/wsrp/portlet/@{portletName}Portlet.class"/>
+ </fileset>
+ </jar>
+ </sequential>
+ </macrodef>
+
</project>
More information about the jboss-cvs-commits
mailing list