[portal-commits] JBoss Portal SVN: r12626 - in branches/JBoss_Portal_Branch_2_7: core-admin and 3 other directories.

Author: thomas.heute(a)jboss.com Date: 2009-01-26 05:35:23 -0500 (Mon, 26 Jan 2009) New Revision: 12626 Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7/core-admin/build.xml branches/JBoss_Portal_Branch_2_7/core-identity/build.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml Log: Using Portlet Bridge 1.0.0.B6, and removing Richfaces libs Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-01-26 09:53:50 UTC (rev 12625) +++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2009-01-26 10:35:23 UTC (rev 12626) @@ -94,8 +94,7 @@ <componentref name="ehcache" version="1.2.2"/> <componentref name="el" version="1.0"/> <componentref name="facelets" version="1.1.15-B1"/> - <componentref name="richfaces" version="3.3.0.GA"/> - <componentref name="jboss/portlet-bridge" version="1.0.0.B5"/> + <componentref name="jboss/portlet-bridge" version="1.0.0.B6"/> <componentref name="hibernate" version="3.2.4.SP1_CP06-brew"/> <componentref name="httpunit" version="1.6"/> <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/> Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2009-01-26 09:53:50 UTC (rev 12625) +++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2009-01-26 10:35:23 UTC (rev 12626) @@ -99,7 +99,6 @@ <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> <path refid="el.el.classpath"/> - <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> <path refid="jboss/portlet.bridge.classpath"/> @@ -193,9 +192,6 @@ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.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"/> <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2009-01-26 09:53:50 UTC (rev 12625) +++ branches/JBoss_Portal_Branch_2_7/core-identity/build.xml 2009-01-26 10:35:23 UTC (rev 12626) @@ -108,7 +108,6 @@ <path refid="jbpm.jpdl.classpath"/> <path refid="glassfish.jsf.classpath"/> <path refid="el.el.classpath"/> - <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> <path refid="jboss/portlet.bridge.classpath"/> @@ -211,9 +210,6 @@ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.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"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 09:53:50 UTC (rev 12625) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 10:35:23 UTC (rev 12626) @@ -87,19 +87,6 @@ <param-value>server</param-value> </context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>Faces Servlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - <servlet> <servlet-name>Faces Servlet</servlet-name> <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2009-01-26 09:53:50 UTC (rev 12625) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2009-01-26 10:35:23 UTC (rev 12626) @@ -100,7 +100,6 @@ <path refid="junit.junit.classpath"/> <path refid="glassfish.jsf.classpath"/> <path refid="el.el.classpath"/> - <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> <path refid="portlet.portlet.classpath"/> <path refid="jboss/portlet.bridge.classpath"/> @@ -208,9 +207,6 @@ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.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"/> <fileset dir="${build.lib}" includes="portal-wsrp-admin-lib.jar"/> <fileset dir="${jboss.portal-faces.root}/lib" includes="portal-faces-lib.jar"/> <!--<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>-->