Author: wesleyhales Date: 2008-03-12 13:04:09 -0400 (Wed, 12 Mar 2008) New Revision: 10275 Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/build.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml Log: core-admin migration to portlet bridge Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/build.xml 2008-03-12 15:51:48 UTC (rev 10274) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/build.xml 2008-03-12 17:04:09 UTC (rev 10275) @@ -95,12 +95,17 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="apache.myfaces.classpath"/> + <path refid="sun.jsf.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="facelets.facelets.classpath"/> <path refid="el.el.classpath"/> - <pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/> + <pathelement location="${source.etc}/sun-jsf/jsf-facelets-1.1.14.jar"/> + <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"/> + <pathelement location="${source.etc}/sun-jsf/richfaces-api-3.1.4.SR1.jar"/> + <pathelement location="${source.etc}/sun-jsf/richfaces-impl-3.1.4.SR1.jar"/> + <pathelement location="${source.etc}/sun-jsf/richfaces-ui-3.1.4.SR1.jar"/> + </path> <!-- Configure modules --> @@ -185,14 +190,16 @@ </jar> <!-- portal-admin.war --> - <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib2"> - <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.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="../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="${commons.el.lib}" includes="commons-el.jar"/> + <copy todir="${build.resources}/portal-admin-war/WEB-INF/lib"> + <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-facelets-1.1.14.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="../core-admin/src/etc/sun-jsf" includes="richfaces-api-3.1.4.SR1.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="richfaces-impl-3.1.4.SR1.jar"/> + <fileset dir="../core-admin/src/etc/sun-jsf" includes="richfaces-ui-3.1.4.SR1.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"/> <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-03-12 15:51:48 UTC (rev 10274) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-03-12 17:04:09 UTC (rev 10275) @@ -28,9 +28,16 @@ <faces-config> <application> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> + </application> + <factory> + <faces-context-factory> + org.jboss.portletbridge.context.FacesContextFactoryImpl + </faces-context-factory> + </factory> <converter> <converter-for-class>org.jboss.portal.core.model.content.ContentType</converter-for-class> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-03-12 15:51:48 UTC (rev 10274) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/jboss-portlet.xml 2008-03-12 17:04:09 UTC (rev 10275) @@ -35,6 +35,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> @@ -53,6 +56,9 @@ <trans-attribute>Required</trans-attribute> </transaction> <header-content> + <script src="/faces/rfRes/org/ajax4jsf/framework.pack.js" type="text/javascript" ></script> + <script src="/faces/rfRes/org/richfaces/ui.pack.js" type="text/javascript" ></script> + <link rel="stylesheet" type="text/css" href="/faces/rfRes/org/richfaces/skin.xcss" /> <link rel="stylesheet" type="text/css" href="/css/style.css" media="screen"/> </header-content> <portlet-info> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml 2008-03-12 15:51:48 UTC (rev 10274) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet-instances.xml 2008-03-12 17:04:09 UTC (rev 10275) @@ -47,4 +47,10 @@ <portlet-ref>DashboardConfigPortlet</portlet-ref> </instance> </deployment> + <deployment> + <instance> + <instance-id>DashboardConfigPortletSecondInstance</instance-id> + <portlet-ref>DashboardConfigPortlet</portlet-ref> + </instance> + </deployment> </deployments> \ No newline at end of file Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-03-12 15:51:48 UTC (rev 10274) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-03-12 17:04:09 UTC (rev 10275) @@ -31,11 +31,15 @@ <description>Administration Portlet</description> <portlet-name>AdminPortlet</portlet-name> <display-name>Administration Portlet</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> - <name>default-view</name> + <name>javax.portlet.faces.defaultViewId.view</name> <value>/WEB-INF/jsf/objects.xhtml</value> </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode> @@ -49,11 +53,15 @@ <description>Dashboard Configurator Portlet</description> <portlet-name>DashboardConfigPortlet</portlet-name> <display-name>Dashboard Configurator Portlet</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> <init-param> - <name>default-view</name> + <name>javax.portlet.faces.defaultViewId.view</name> <value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value> </init-param> + <init-param> + <name>javax.portlet.faces.preserveActionParams</name> + <value>true</value> + </init-param> <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> Modified: branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-03-12 15:51:48 UTC (rev 10274) +++ branches/JBoss_Portal_2_6_4_JBPB/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2008-03-12 17:04:09 UTC (rev 10275) @@ -28,32 +28,42 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <!-- MyFaces specific configuration --> + <!-- Bridge specific configuration --> <context-param> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> - <param-value>true</param-value> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value> + org.jboss.portletbridge.application.FaceletPortletViewHandler + </param-value> </context-param> <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> + <param-name>javax.portlet.faces.renderPolicy</param-name> + <param-value>ALWAYS_DELEGATE</param-value> + </context-param> + <context-param> + <param-name>javax.portlet.faces.preserveActionParams</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> </context-param> <context-param> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>false</param-value> + <param-name>org.richfaces.LoadScriptStrategy</param-name> + <param-value>NONE</param-value> </context-param> <context-param> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> <param-value>false</param-value> </context-param> - <context-param> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> - </context-param> <!-- Facelet configuration --> <context-param> <param-name>facelets.DEVELOPMENT</param-name> - <param-value>false</param-value> + <param-value>true</param-value> </context-param> <context-param> <param-name>facelets.SKIP_COMMENTS</param-name> @@ -76,9 +86,14 @@ <!-- The JSF servlet --> <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>org.jboss.portal.faces.loader.FacesLoaderServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - + <servlet-name>FacesServlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>FacesServlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + </web-app>