Author: chris.laprun(a)jboss.com
Date: 2008-02-10 23:56:13 -0500 (Sun, 10 Feb 2008)
New Revision: 9933
Modified:
modules/portlet/trunk/test/src/test/build.xml
Log:
- Started packaging effort. Only as42 version has been tested so far.
Modified: modules/portlet/trunk/test/src/test/build.xml
===================================================================
--- modules/portlet/trunk/test/src/test/build.xml 2008-02-11 04:05:50 UTC (rev 9932)
+++ modules/portlet/trunk/test/src/test/build.xml 2008-02-11 04:56:13 UTC (rev 9933)
@@ -404,7 +404,6 @@
<path refid="mc.portal-test-generic"/>
-
<!-- MC 2.0.0.Beta4 -->
<path refid="mc.trove"/>
<path refid="mc.javassist"/>
@@ -688,10 +687,40 @@
</target>
+
+ <macrodef name="generic-package-simple-portal">
+ <attribute name="server"/>
+ <sequential>
+ <copy todir="@{server}/simple-portal" flatten="true">
+ <path>
+ <path location="${dependency.portal-common.jar}"/>
+ <path location="${dependency.portal-common-portal.jar}"/>
+ <path location="${dependency.portal-portlet.jar}"/>
+ <path location="${dependency.portal-web.jar}"/>
+ <path location="${dependency.jsr168api.jar}"/>
+ </path>
+ </copy>
+
+ <copy todir="(a){server}/simple-portal/simple-portal.war">
+ <fileset dir="${test.temp.dir}/simple-portal-war"/>
+ </copy>
+ </sequential>
+ </macrodef>
+
<target name="package-simple-portal" depends="prepare_env">
+ <property name="portal.dir" value="${target}/portal"/>
+ <property name="simple.tomcat.dir"
value="${portal.dir}/tomcat"/>
+ <property name="simple.as42.dir"
value="${portal.dir}/as42"/>
+ <property name="simple.as5.dir"
value="${portal.dir}/as5"/>
- <delete dir="${target}/simple-portal"/>
+ <delete dir="${portal.dir}"/>
+ <mkdir dir="${portal.dir}"/>
+ <mkdir dir="${simple.tomcat.dir}"/>
+ <mkdir dir="${simple.as42.dir}"/>
+ <mkdir dir="${simple.as5.dir}"/>
+
+
<jar jarfile="${target}/portlet-test-lib.jar">
<fileset dir="${target}/classes"/>
</jar>
@@ -722,83 +751,77 @@
<path refid="mc.jboss_xb"/>
<path refid="mc.jboss_aop"/>
<path refid="mc.jboss_microcontainer"/>
+ </copy>
- <!-- For Tomcat -->
+ <!-- AS 4.2 -->
+ <generic-package-simple-portal server="${simple.as42.dir}"/>
+
+ <!-- Tomcat -->
+ <generic-package-simple-portal server="${simple.tomcat.dir}"/>
+ <copy
todir="${simple.tomcat.dir}/simple-portal/simple-portal.war/WEB-INF/lib"
flatten="true">
<path>
<pathelement path="${dependency.log4j.jar}"/>
<pathelement path="${dependency.activation.jar}"/>
<pathelement path="${dependency.xercesImpl.jar}"/>
- <!--<path refid="mc.jaxb-api"/>-->
</path>
-
</copy>
- <mkdir dir="${target}/simple-portal"/>
+ <!-- AS 5 -->
+ <generic-package-simple-portal server="${simple.as5.dir}"/>
- <jar jarfile="${target}/simple-portal/simple-portal.war">
- <fileset dir="${test.temp.dir}/simple-portal-war"/>
- </jar>
-
- <copy todir="${target}/simple-portal" flatten="true">
- <path>
- <path location="${dependency.portal-common.jar}"/>
- <path location="${dependency.portal-common-portal.jar}"/>
- <path location="${dependency.portal-portlet.jar}"/>
- <path location="${dependency.portal-web.jar}"/>
- <path location="${dependency.jsr168api.jar}"/>
- </path>
- </copy>
-
<delete file="${target}/portlet-test-lib.jar"/>
- <antcall target="package-demo-portlets"/>
+ <antcall target="__package-demo-portlets"/>
</target>
- <target name="package-demo-portlets" depends="prepare_env">
+ <target name="__package-demo-portlets"
depends="prepare_env">
- <mkdir dir="${test.temp.dir}/portal"/>
- <mkdir dir="${test.temp.dir}/portal/samples"/>
- <mkdir dir="${target}/portal"/>
+ <property name="samples.target.dir"
value="${portal.dir}/samples"/>
+ <property name="samples.tmp.dir"
value="${test.temp.dir}/portal"/>
- <copy
todir="${test.temp.dir}/portal/samples-google-map-portlet-war">
+ <mkdir dir="${samples.tmp.dir}"/>
+ <mkdir dir="${samples.target.dir}"/>
+
+ <copy todir="${samples.tmp.dir}/samples-google-map-portlet-war">
<fileset
dir="src/test/resources/portal/samples/google-map-portlet-war"/>
- <fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class"/>
+ <fileset dir="${target}/classes"
+
includes="org/jboss/portal/portlet/portal/samples/GoogleClippingPortlet.class"/>
</copy>
- <jar jarfile="${target}/portal/samples-google-map-portlet.war">
- <fileset
dir="${test.temp.dir}/portal/samples-google-map-portlet-war"/>
+ <jar
jarfile="${samples.target.dir}/samples-google-map-portlet.war">
+ <fileset
dir="${samples.tmp.dir}/samples-google-map-portlet-war"/>
</jar>
- <copy
todir="${test.temp.dir}/portal/samples-google-weather-portlet-war">
+ <copy
todir="${samples.tmp.dir}/samples-google-weather-portlet-war">
<fileset
dir="src/test/resources/portal/samples/google-weather-portlet-war"/>
<fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/*.class"/>
</copy>
- <jar
jarfile="${target}/portal/samples-google-weather-portlet.war">
- <fileset
dir="${test.temp.dir}/portal/samples-google-weather-portlet-war"/>
+ <jar
jarfile="${samples.target.dir}/samples-google-weather-portlet.war">
+ <fileset
dir="${samples.tmp.dir}/samples-google-weather-portlet-war"/>
</jar>
- <copy
todir="${test.temp.dir}/portal/samples-remotecontrol-portlet-war">
+ <copy
todir="${samples.tmp.dir}/samples-remotecontrol-portlet-war">
<fileset
dir="src/test/resources/portal/samples/remotecontrol-portlet-war"/>
<fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/RemoteControlResourcePortlet.class"/>
</copy>
- <jar jarfile="${target}/portal/samples-remotecontrol-portlet.war">
- <fileset
dir="${test.temp.dir}/portal/samples-remotecontrol-portlet-war"/>
+ <jar
jarfile="${samples.target.dir}/samples-remotecontrol-portlet.war">
+ <fileset
dir="${samples.tmp.dir}/samples-remotecontrol-portlet-war"/>
</jar>
- <copy
todir="${test.temp.dir}/portal/samples-cart-event-portlet-war">
+ <copy todir="${samples.tmp.dir}/samples-cart-event-portlet-war">
<fileset
dir="src/test/resources/portal/samples/cart-event-portlet-war"/>
<fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/event/*.class"/>
</copy>
- <jar jarfile="${target}/portal/samples-cart-event-portlet.war">
- <fileset
dir="${test.temp.dir}/portal/samples-cart-event-portlet-war"/>
+ <jar
jarfile="${samples.target.dir}/samples-cart-event-portlet.war">
+ <fileset
dir="${samples.tmp.dir}/samples-cart-event-portlet-war"/>
</jar>
- <copy todir="${test.temp.dir}/portal/samples-basic-war">
+ <copy todir="${samples.tmp.dir}/samples-basic-war">
<fileset dir="src/test/resources/portal/samples/basic-war"/>
<fileset dir="${target}/classes"
includes="org/jboss/portal/portlet/portal/samples/basic/**"/>
</copy>
- <jar jarfile="${target}/portal/samples-basic.war">
- <fileset dir="${test.temp.dir}/portal/samples-basic-war"/>
+ <jar jarfile="${samples.target.dir}/samples-basic.war">
+ <fileset dir="${samples.tmp.dir}/samples-basic-war"/>
</jar>
</target>
Show replies by date