Author: thomas.heute(a)jboss.com Date: 2008-05-30 10:16:09 -0400 (Fri, 30 May 2008) New Revision: 10862 Removed: branches/JBoss_Portal_Branch_2_7/core-admin/src/etc/ Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core-admin/build.xml Log: - Using PortletBridge 1.0.0.B2 from the repo - Using RichFaces 3.2.1.GA - Removed embedded libs Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-05-30 13:44:38 UTC (rev 10861) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-05-30 14:16:09 UTC (rev 10862) @@ -77,7 +77,8 @@ <componentref name="ehcache" version="1.2.2"/> <componentref name="el" version="1.0"/> <componentref name="facelets" version="1.1.14"/> - <componentref name="richfaces" version="3.1.4.SR1"/> + <componentref name="richfaces" version="3.2.1.GA"/> + <componentref name="jboss/portlet-bridge" version="1.0.0.B2"/> <componentref name="hibernate" version="3.2.0.CR2"/> <componentref name="httpunit" version="1.6"/> <componentref name="hsqldb" version="1.8.0.2"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-05-30 13:44:38 UTC (rev 10861) +++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-05-30 14:16:09 UTC (rev 10862) @@ -103,8 +103,7 @@ <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> - <pathelement location="${source.etc}/sun-jsf/portletbridge-api-1.0.0-SNAPSHOT.jar"/> - <pathelement location="${source.etc}/sun-jsf/portletbridge-impl-1.0.0-SNAPSHOT.jar"/> + <path refid="jboss/portlet.bridge.classpath"/> </path> <!-- Configure modules --> @@ -193,8 +192,8 @@ <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib"> <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/> <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/> - <fileset dir="../core-admin/src/etc/sun-jsf" includes="portletbridge-api-1.0.0-SNAPSHOT.jar"/> - <fileset dir="../core-admin/src/etc/sun-jsf" includes="portletbridge-impl-1.0.0-SNAPSHOT.jar"/> + <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-api.jar"/> + <fileset dir="${jboss/portlet.bridge.lib}" includes="portletbridge-impl.jar"/> <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-api.jar"/> <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-impl.jar"/> <fileset dir="${richfaces.richfaces.lib}" includes="richfaces-ui.jar"/>