Author: sohil.shah(a)jboss.com Date: 2007-06-18 17:48:52 -0400 (Mon, 18 Jun 2007) New Revision: 7457 Modified: trunk/build/build-thirdparty.xml trunk/core-admin/build.xml Log: integrating the jsf-facelets and jsf-portlet patched files Modified: trunk/build/build-thirdparty.xml =================================================================== --- trunk/build/build-thirdparty.xml 2007-06-18 09:38:44 UTC (rev 7456) +++ trunk/build/build-thirdparty.xml 2007-06-18 21:48:52 UTC (rev 7457) @@ -69,7 +69,7 @@ <componentref name="dom4j" version="1.6.1jboss"/> <componentref name="ehcache" version="1.2.2"/> <componentref name="el" version="1.0"/> - <componentref name="facelets" version="1.1.1"/> + <componentref name="facelets" version="1.1.1-patched-jboss4.2"/> <componentref name="hibernate" version="3.2.0.CR2"/> <componentref name="httpunit" version="1.6"/> <componentref name="hsqldb" version="1.8.0.2"/> @@ -95,8 +95,7 @@ <componentref name="jsunit" version="2.1"/> <componentref name="junit" version="3.8.1"/> <componentref name="odmg" version="3.0"/> - <componentref name="oswego-concurrent" version="1.3.4"/> - <componentref name="portals-bridges" version="1.0"/> + <componentref name="oswego-concurrent" version="1.3.4"/> <componentref name="qdox" version="1.4"/> <componentref name="trove" version="1.0.2"/> <componentref name="sleepycat" version="3.0.12"/> @@ -110,6 +109,9 @@ <componentref name="jbpm/jaronly" version="3.1.2"/> <componentref name="freemarker" version="2.3.9"/> <componentref name="wutka-dtdparser" version="1.2.1"/> + <componentref name="portals-bridges" version="1.0"/> + <!-- patched jsf-portlet bridge --> + <componentref name="portals-bridges/jsf-portlet" version="1.1.4-patched"/> </build> <synchronizeinfo/> Modified: trunk/core-admin/build.xml =================================================================== --- trunk/core-admin/build.xml 2007-06-18 09:38:44 UTC (rev 7456) +++ trunk/core-admin/build.xml 2007-06-18 21:48:52 UTC (rev 7457) @@ -203,6 +203,7 @@ <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/> + <fileset dir="${portals.bridges/jsf.portlet.lib}" includes="jsf-portlet.jar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/portal-admin.war">