Author: wesleyhales Date: 2008-06-02 15:08:03 -0400 (Mon, 02 Jun 2008) New Revision: 10905 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml Log: Move core-wsrp to portletbridge Modified: branches/JBoss_Portal_Branch_2_7/core-admin/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-admin/build.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -98,7 +98,6 @@ <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"/> <path refid="richfaces.richfaces.classpath"/> <path refid="facelets.facelets.classpath"/> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/build.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -95,12 +95,15 @@ <path refid="jboss.cache.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> - <path refid="apache.myfaces.classpath"/> <path refid="apache.log4j.classpath"/> <path refid="sun.servlet.classpath"/> - <path refid="facelets.facelets.classpath"/> <path refid="junit.junit.classpath"/> + <path refid="sun.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"/> </path> <!-- Configure modules --> @@ -200,18 +203,21 @@ <property name="build.wsrp-admin.war" value="${build.resources}/portal-wsrp-admin-war"/> <!-- Classes loaded by Portal's specific JSF wrapper. Note that it looks for classes in WEB-INF/lib2 --> - <copy todir="${build.wsrp-admin.war}/WEB-INF/lib2"> - <fileset dir="${apache.myfaces.lib}" includes="myfaces-api.jar,myfaces-impl.jar,jstl.jar"/> + <copy todir="${build.wsrp-admin.war}/WEB-INF/lib"> + <fileset dir="${apache.myfaces.lib}" includes="jstl.jar"/> + <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"/> - <!-- For JSF --> - <fileset dir="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"/> + <!--<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>--> <fileset dir="${apache.lang.lib}" includes="commons-lang.jar"/> <fileset dir="${apache.beanutils.lib}" includes="commons-beanutils.jar"/> - <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> + <fileset dir="${apache.digester.lib}" includes="commons-digester.jar"/> + <!--<fileset dir="${commons.el.lib}" includes="commons-el.jar"/>--> </copy> <copy todir="${build.wsrp-admin.war}/WEB-INF/lib"> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -28,9 +28,17 @@ <faces-config> <!-- Facelet portlet view handler--> + <application> - <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> + <view-handler> + org.jboss.portletbridge.application.PortletViewHandler + </view-handler> </application> + <factory> + <faces-context-factory> + org.jboss.portletbridge.context.FacesContextFactoryImpl + </faces-context-factory> + </factory> <converter> <converter-for-class>org.jboss.portal.wsrp.registration.LocalizedString</converter-for-class> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jboss-portlet.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -21,7 +21,7 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" - "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> + "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd"> <portlet-app> <portlet> <portlet-name>WSRPConfigurationPortlet</portlet-name> @@ -29,6 +29,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="/style.css" media="screen"/> </header-content> </portlet> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/portlet.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -25,25 +25,29 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1... http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"> - <portlet> - <description>Configuration portlet for WSRP.</description> - <portlet-name>WSRPConfigurationPortlet</portlet-name> - <display-name>WSRP Configuration</display-name> - <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> - <init-param> - <name>default-view</name> - <value>/WEB-INF/jsf/consumers/consumers.xhtml</value> - </init-param> - <supports> - <mime-type>text/html</mime-type> - <portlet-mode>VIEW</portlet-mode> - </supports> - <supported-locale>en</supported-locale> - <supported-locale>fr</supported-locale> - <resource-bundle>WSRPConfigurationResource</resource-bundle> - <portlet-info> - <title>WSRP Configuration</title> - <keywords>management,admin,wsrp</keywords> - </portlet-info> - </portlet> + <portlet> + <description>Configuration portlet for WSRP.</description> + <portlet-name>WSRPConfigurationPortlet</portlet-name> + <display-name>WSRP Configuration</display-name> + <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class> + <init-param> + <name>javax.portlet.faces.defaultViewId.view</name> + <value>/WEB-INF/jsf/consumers/consumers.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> + </supports> + <supported-locale>en</supported-locale> + <supported-locale>fr</supported-locale> + <resource-bundle>WSRPConfigurationResource</resource-bundle> + <portlet-info> + <title>WSRP Configuration</title> + <keywords>management,admin,wsrp</keywords> + </portlet-info> + </portlet> </portlet-app> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2008-06-02 17:09:40 UTC (rev 10904) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2008-06-02 19:08:03 UTC (rev 10905) @@ -27,26 +27,39 @@ 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 --> <context-param> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> + <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name> + <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value> + </context-param> + + <context-param> + <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.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> + <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name> + <param-value>rfRes</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>false</param-value> + <param-name>org.richfaces.LoadStyleStrategy</param-name> + <param-value>NONE</param-value> </context-param> + <context-param> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</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.PRETTY_HTML</param-name> - <param-value>true</param-value> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>false</param-value> </context-param> <!-- Facelet configuration --> @@ -69,13 +82,31 @@ <param-value>server</param-value> </context-param> - <!-- JSF entry point --> + <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>FacesServlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + <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-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>