Author: chris.laprun(a)jboss.com
Date: 2007-07-13 19:05:27 -0400 (Fri, 13 Jul 2007)
New Revision: 7765
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
- Include core-wsrp in the WSRP sar.
- Clean-ups.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-13 23:04:52 UTC (rev 7764)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-07-13 23:05:27 UTC (rev 7765)
@@ -189,7 +189,7 @@
<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="log.dir" value="${module.output}/logs"/>
<property name="reports.dir"
value="${module.output}/reports"/>
<property name="test.reports"
value="${module.output}/tests"/>
<property name="build.resources.test"
value="${build.resources}/tests"/>
@@ -273,11 +273,12 @@
<!--| modules. |-->
<!--+====================================================================+-->
- <target name="output"
- description="Generate WSRP Service archive."
- depends="compile">
+ <target name="output" description="Generate WSRP Service
archive." depends="compile">
<mkdir dir="${build.lib}"/>
+ <!-- Build Admin GUI... -->
+ <ant antfile="../core-wsrp/build.xml" output="output.log"
dir="../core-wsrp" target="output"/>
+
<!-- -->
<jar jarfile="${build.lib}/portal-wsrp-client.jar">
<fileset dir="${build.resources}/portal-wsrp-client-jar"/>
@@ -286,26 +287,12 @@
<fileset dir="${build.classes}">
<exclude name="org/jboss/portal/test/**"/>
</fileset>
- <!--<fileset
dir="${build.resources}/portal-wsrp-lib-jar"/>-->
</jar>
<jar jarfile="${build.lib}/portal-wsrp-test-lib.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/portal/test/**"/>
</fileset>
</jar>
- <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib">
- <fileset dir="${jboss.portal-faces.root}/lib"
includes="portal-faces-lib.jar"/>
- <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,
myfaces-impl.jar, jstl.jar"/>
- <fileset dir="${commons.el.lib}"
includes="commons-el.jar"/>
- <fileset dir="${apache.beanutils.lib}"
includes="commons-beanutils.jar"/>
- <fileset dir="${apache.digester.lib}"
includes="commons-digester.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar,
el-ri.jar"/>
- <fileset dir="${facelets.facelets.lib}"
includes="jsf-facelets.jar"/>
- <fileset dir="../core-admin/src/etc/sun-jsf"
includes="jsf-example.jar"/>
- </copy-->
- <!--copy todir="${build.resources}/portal-wsrp-jse/WEB-INF/lib">
- <fileset dir="${build.lib}"
includes="portal-wsrp-lib.jar"/>
- </copy-->
<jar jarfile="${build.lib}/portal-wsrp.jse">
<fileset dir="${build.resources}/portal-wsrp-jse"/>
</jar>
@@ -314,7 +301,8 @@
<fileset dir="${build.lib}"
includes="portal-wsrp.jse"/>
</copy>
<copy todir="${build.resources}/portal-wsrp-sar"
overwrite="true">
- <fileset dir="${build.lib}"
includes="portal-wsrp-lib.jar"/>
+ <fileset dir="${build.lib}"
includes="portal-wsrp-lib.jar"/>
+ <fileset dir="../core-wsrp/output/lib"
includes="portal-wsrp-admin.war"/>
</copy>
<jar jarfile="${build.lib}/portal-wsrp.sar">
<fileset dir="${build.resources}/portal-wsrp-sar"
includes="**/*"/>
@@ -586,7 +574,7 @@
</target>
<!-- Test portlets -->
- <target name="package-test-portlets" description="Generate the test
portlets archives" depends="compile">
+ <target name="package-test-portlets" description="Generate the test
portlets archives" depends="compile">
<!-- Simple test portlet -->
<package-test-portlet archiveName="basic"
portletName="Basic"/>
@@ -831,7 +819,6 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.other.RegistrationPropertyDescriptionTestCase"/>
<test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.handler.RequestHeaderClientHandlerTestCase"/>
- <!--test todir="${test.reports}"
name="org.jboss.portal.test.wsrp.other.ConsumerBeanTestCase"/-->
</x-test>
<x-sysproperty>
<!--<jvmarg value="-Xdebug"/>
@@ -873,4 +860,4 @@
</sequential>
</macrodef>
-</project>
+</project>
\ No newline at end of file