Author: thomas.heute(a)jboss.com Date: 2007-07-30 08:43:44 -0400 (Mon, 30 Jul 2007) New Revision: 7841 Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_6/core-admin/build.xml branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml Log: Removed Sun RI JSF portlet bridge Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-07-26 16:22:16 UTC (rev 7840) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-07-30 12:43:44 UTC (rev 7841) @@ -114,8 +114,6 @@ <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.2-patched"/> </build> <synchronizeinfo/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-07-26 16:22:16 UTC (rev 7840) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-07-30 12:43:44 UTC (rev 7841) @@ -196,8 +196,10 @@ <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <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"/> + <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.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"/> </copy> <copy todir="${build.resources}/portal-admin-war"> <fileset dir="${source.bin}/portal-admin-war"/> @@ -208,9 +210,6 @@ </copy> <copy todir="${build.resources}/portal-admin.sar/lib"> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-loader-lib.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"/> </copy> <copy todir="${build.resources}/portal-admin.sar/portal-admin.war"> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-26 16:22:16 UTC (rev 7840) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/build.xml 2007-07-30 12:43:44 UTC (rev 7841) @@ -211,7 +211,6 @@ <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"/> <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"/>