Author: thomas.heute(a)jboss.com Date: 2007-07-11 17:21:55 -0400 (Wed, 11 Jul 2007) New Revision: 7725 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-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml Log: Isolate myFaces inside the sar Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-07-11 21:12:42 UTC (rev 7724) +++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-07-11 21:21:55 UTC (rev 7725) @@ -51,8 +51,10 @@ <componentref name="apache-ant" version="1.6.5"/> <componentref name="jackrabbit" version="1.1.1"/> <componentref name="apache-myfaces" version="1.1.1"/> + <componentref name="apache-beanutils" version="1.7.0"/> <componentref name="apache-codec" version="1.3.0"/> <componentref name="apache-collections" version="3.1"/> + <componentref name="apache-digester" version="1.6"/> <!--<componentref name="apache-directory" version="mixed"/>--> <componentref name="apache-fileupload" version="1.1.1"/> <componentref name="apache-httpclient" version="3.0.1"/> @@ -65,6 +67,7 @@ <componentref name="asm" version="1.5.3"/> <componentref name="beanshell" version="1.3.0"/> <componentref name="cglib" version="2.1.3"/> + <componentref name="commons-el" version="1.0"/> <componentref name="dbunit" version="2.1"/> <componentref name="dom4j" version="1.6.1jboss"/> <componentref name="ehcache" version="1.2.2"/> @@ -103,6 +106,7 @@ <componentref name="sun-jaf" version="1.0.2"/> <componentref name="sun-javacc" version="3.2-portal"/> <componentref name="sun-javamail" version="1.3.1"/> + <componentref name="sun-jsf" version="1.2.1_02"/> <componentref name="sun-opends" version="snapshot"/> <componentref name="sun-servlet" version="2.4"/> <componentref name="xdoclet" version="1.2.3"/> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-07-11 21:12:42 UTC (rev 7724) +++ branches/JBoss_Portal_Branch_2_6/core-admin/build.xml 2007-07-11 21:21:55 UTC (rev 7725) @@ -195,15 +195,17 @@ <fileset dir="${build.resources}/portal-admin-sar"/> </copy> <copy todir="${build.resources}/portal-admin.sar/lib"> - <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> - <!--<fileset dir="." includes="jsf-portlet.jar"/>--> + <fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/> - <!-- For JSF --> - <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"/> + <!-- For JSF --> + <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-admin.sar/portal-admin.war"> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-11 21:12:42 UTC (rev 7724) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-sar/META-INF/jboss-service.xml 2007-07-11 21:21:55 UTC (rev 7725) @@ -23,6 +23,10 @@ <server> + <loader-repository> + org.jboss.portal:loader=core-admin + </loader-repository> + <mbean code="org.jboss.portal.core.model.instance.InstanceCommandFactory" name="portal:commandFactory=Configurator" Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-07-11 21:12:42 UTC (rev 7724) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-07-11 21:21:55 UTC (rev 7725) @@ -31,9 +31,9 @@ <description>Administration Portlet</description> <portlet-name>AdminPortlet</portlet-name> <display-name>Administration Portlet</display-name> - <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class> + <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> <init-param> - <name>VIEW</name> + <name>default-view</name> <value>/WEB-INF/jsf/objects.xhtml</value> </init-param> <supports> @@ -49,9 +49,9 @@ <description>Dashboard Configurator Portlet</description> <portlet-name>DashboardConfigPortlet</portlet-name> <display-name>Dashboard Configurator Portlet</display-name> - <portlet-class>org.jboss.portal.faces.portlet.JSFMetaBridgePortlet</portlet-class> + <portlet-class>org.apache.myfaces.portlet.MyFacesGenericPortlet</portlet-class> <init-param> - <name>VIEW</name> + <name>default-view</name> <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value> </init-param> <expiration-cache>-1</expiration-cache> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2007-07-11 21:12:42 UTC (rev 7724) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2007-07-11 21:21:55 UTC (rev 7725) @@ -80,10 +80,14 @@ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> + + <context-param> + <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> + <param-value>true</param-value> + </context-param> - <!-- The JSF meta bridge bootstrap --> <listener> - <display-name> Faces Meta Bridge Bootstrap</display-name> - <listener-class>org.jboss.portal.faces.portlet.JSFMetaBridgeBootstrap</listener-class> + <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> </listener> + </web-app>